diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-09-30 09:44:05 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-09-30 09:44:05 +0000 |
commit | be8a76c4c2784cd7f27613918bcfec42580898b9 (patch) | |
tree | a2b6fa06a67880878e18adafffe3f9c3290018c5 /patches/elektra-0.7.0rc5/generic | |
parent | ee5f3196af73f8b4d3f2570bd0d627bed851c699 (diff) | |
download | ptxdist-be8a76c4c2784cd7f27613918bcfec42580898b9.tar.gz ptxdist-be8a76c4c2784cd7f27613918bcfec42580898b9.tar.xz |
* elektra: initial submit; needs further work
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8902 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/elektra-0.7.0rc5/generic')
5 files changed, 23109 insertions, 0 deletions
diff --git a/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-autogen.diff b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-autogen.diff new file mode 100644 index 000000000..6ab2f92a9 --- /dev/null +++ b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-autogen.diff @@ -0,0 +1,22954 @@ +--- + Makefile.in | 172 + aclocal.m4 | 386 - + benchmarks/Makefile.in | 101 + configure | 7567 +++++++++++++++--------------------- + doc/Makefile.in | 161 + doc/images/Makefile.in | 102 + doc/standards/Makefile.in | 102 + examples/Makefile.in | 163 + scripts/Makefile.in | 109 + src/Makefile.in | 147 + src/backends/Makefile.in | 149 + src/backends/berkeleydb/Makefile.in | 173 + src/backends/daemon/Makefile.in | 291 - + src/backends/filesys/Makefile.in | 174 + src/backends/fstab/Makefile.in | 174 + src/backends/gconf/Makefile.in | 176 + src/backends/hosts/Makefile.in | 174 + src/backends/ini/Makefile.in | 201 + src/backends/passwd/Makefile.in | 174 + src/backends/template/Makefile.in | 173 + src/bindings/Makefile.in | 147 + src/bindings/cpp/Makefile.in | 242 - + src/bindings/cpp/tests/Makefile.in | 166 + src/bindings/python/Makefile.in | 167 + src/include/Makefile.in | 120 + src/kdb/Makefile.in | 233 - + src/libelektra/Makefile.in | 381 - + src/libelektratools/Makefile.in | 196 + src/libhelper/Makefile.in | 173 + src/libloader/Makefile.in | 159 + src/preload/Makefile.in | 200 + tests/Makefile.in | 180 + xmlschema/Makefile.in | 108 + 33 files changed, 5865 insertions(+), 7476 deletions(-) + +Index: elektra-0.7.0rc5/aclocal.m4 +=================================================================== +--- elektra-0.7.0rc5.orig/aclocal.m4 ++++ elektra-0.7.0rc5/aclocal.m4 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,6 +11,14 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++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'.])]) ++ + # iconv.m4 serial AM6 (gettext-0.17) + dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -7851,195 +7859,6 @@ AC_SUBST([SED]) + AC_MSG_RESULT([$SED]) + ]) + +-# Configure paths for LIBXML2 +-# Mike Hommey 2004-06-19 +-# use CPPFLAGS instead of CFLAGS +-# Toshio Kuratomi 2001-04-21 +-# Adapted from: +-# Configure paths for GLIB +-# Owen Taylor 97-11-3 +- +-dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +-dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS +-dnl +-AC_DEFUN([AM_PATH_XML2],[ +-AC_ARG_WITH(xml-prefix, +- [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], +- xml_config_prefix="$withval", xml_config_prefix="") +-AC_ARG_WITH(xml-exec-prefix, +- [ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)], +- xml_config_exec_prefix="$withval", xml_config_exec_prefix="") +-AC_ARG_ENABLE(xmltest, +- [ --disable-xmltest Do not try to compile and run a test LIBXML program],, +- enable_xmltest=yes) +- +- if test x$xml_config_exec_prefix != x ; then +- xml_config_args="$xml_config_args" +- if test x${XML2_CONFIG+set} != xset ; then +- XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config +- fi +- fi +- if test x$xml_config_prefix != x ; then +- xml_config_args="$xml_config_args --prefix=$xml_config_prefix" +- if test x${XML2_CONFIG+set} != xset ; then +- XML2_CONFIG=$xml_config_prefix/bin/xml2-config +- fi +- fi +- +- AC_PATH_PROG(XML2_CONFIG, xml2-config, no) +- min_xml_version=ifelse([$1], ,2.0.0,[$1]) +- AC_MSG_CHECKING(for libxml - version >= $min_xml_version) +- no_xml="" +- if test "$XML2_CONFIG" = "no" ; then +- no_xml=yes +- else +- XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags` +- XML_LIBS=`$XML2_CONFIG $xml_config_args --libs` +- xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_xmltest" = "xyes" ; then +- ac_save_CPPFLAGS="$CPPFLAGS" +- ac_save_LIBS="$LIBS" +- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" +- LIBS="$XML_LIBS $LIBS" +-dnl +-dnl Now check if the installed libxml is sufficiently new. +-dnl (Also sanity checks the results of xml2-config to some extent) +-dnl +- rm -f conf.xmltest +- AC_TRY_RUN([ +-#include <stdlib.h> +-#include <stdio.h> +-#include <string.h> +-#include <libxml/xmlversion.h> +- +-int +-main() +-{ +- int xml_major_version, xml_minor_version, xml_micro_version; +- int major, minor, micro; +- char *tmp_version; +- +- system("touch conf.xmltest"); +- +- /* Capture xml2-config output via autoconf/configure variables */ +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = (char *)strdup("$min_xml_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string from xml2-config\n", "$min_xml_version"); +- exit(1); +- } +- free(tmp_version); +- +- /* Capture the version information from the header files */ +- tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION); +- if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { +- printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION"); +- exit(1); +- } +- free(tmp_version); +- +- /* Compare xml2-config output to the libxml headers */ +- if ((xml_major_version != $xml_config_major_version) || +- (xml_minor_version != $xml_config_minor_version) || +- (xml_micro_version != $xml_config_micro_version)) +- { +- printf("*** libxml header files (version %d.%d.%d) do not match\n", +- xml_major_version, xml_minor_version, xml_micro_version); +- printf("*** xml2-config (version %d.%d.%d)\n", +- $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); +- return 1; +- } +-/* Compare the headers to the library to make sure we match */ +- /* Less than ideal -- doesn't provide us with return value feedback, +- * only exits if there's a serious mismatch between header and library. +- */ +- LIBXML_TEST_VERSION; +- +- /* Test that the library is greater than our minimum version */ +- if ((xml_major_version > major) || +- ((xml_major_version == major) && (xml_minor_version > minor)) || +- ((xml_major_version == major) && (xml_minor_version == minor) && +- (xml_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", +- xml_major_version, xml_minor_version, xml_micro_version); +- printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** libxml is always available from ftp://ftp.xmlsoft.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 xml2-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); +- printf("*** correct copy of xml2-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_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- +- if test "x$no_xml" = x ; then +- AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$XML2_CONFIG" = "no" ; then +- echo "*** The xml2-config script installed by LIBXML could not be found" +- echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the XML2_CONFIG environment variable to the" +- echo "*** full path to xml2-config." +- else +- if test -f conf.xmltest ; then +- : +- else +- echo "*** Could not run libxml test program, checking why..." +- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" +- LIBS="$LIBS $XML_LIBS" +- AC_TRY_LINK([ +-#include <libxml/xmlversion.h> +-#include <stdio.h> +-], [ LIBXML_TEST_VERSION; return 0;], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding LIBXML or finding the wrong" +- echo "*** version of LIBXML. If it is not finding LIBXML, 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 LIBXML was incorrectly installed" +- echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" +- echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ]) +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- +- XML_CPPFLAGS="" +- XML_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(XML_CPPFLAGS) +- AC_SUBST(XML_LIBS) +- rm -f conf.xmltest +-]) +- + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- + # + # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +@@ -8198,7 +8017,7 @@ else + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -8208,14 +8027,31 @@ fi[]dnl + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -8272,14 +8108,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 7 ++# serial 8 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -8288,8 +8124,10 @@ AC_DEFUN([AM_CONDITIONAL], + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -8303,15 +8141,14 @@ AC_CONFIG_COMMANDS_PRE( + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 ++# serial 9 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -8339,6 +8176,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +@@ -8404,6 +8242,7 @@ AC_CACHE_CHECK([dependency style of $dep + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -8456,7 +8295,8 @@ if test "x$enable_dependency_tracking" ! + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- +@@ -8481,8 +8321,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -8529,14 +8370,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 12 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -8553,16 +8394,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl ++[AC_PREREQ([2.60])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi + + # test whether we have cygpath +@@ -8582,6 +8427,9 @@ m4_ifval([$2], + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +@@ -8617,6 +8465,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) + ]) + +@@ -8630,16 +8482,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -8652,7 +8505,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1 + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -8728,13 +8581,14 @@ AC_MSG_RESULT([$_am_result]) + rm -f confinc confmf + ]) + +-# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 5 + + # AM_PROG_CC_C_O + # -------------- +@@ -8742,6 +8596,7 @@ rm -f confinc confmf + AC_DEFUN([AM_PROG_CC_C_O], + [AC_REQUIRE([AC_PROG_CC_C_O])dnl + AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl + # FIXME: we rely on the cache variable name because + # there is no other way. + set dummy $CC +@@ -8754,18 +8609,22 @@ if eval "test \"`echo '$ac_cv_prog_cc_'$ + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" + fi ++dnl Make sure AC_PROG_CC is never called again, or it will override our ++dnl setting of CC. ++m4_define([AC_PROG_CC], ++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) + ]) + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 5 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -8781,6 +8640,7 @@ AC_SUBST($1)]) + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then +@@ -8791,7 +8651,7 @@ else + fi + ]) + +-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -8799,60 +8659,23 @@ fi + + # AM_PROG_MKDIR_P + # --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) ++# Check for `mkdir -p'. + AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + + # Helper functions for option handling. -*- Autoconf -*- + +@@ -8964,9 +8787,21 @@ dnl Don't test for $cross_compiling = ye + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +@@ -9063,4 +8898,3 @@ AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + +-m4_include([m4/extensions.m4]) +Index: elektra-0.7.0rc5/benchmarks/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/benchmarks/Makefile.in ++++ elektra-0.7.0rc5/benchmarks/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,13 +13,10 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -38,8 +35,7 @@ target_triplet = @target@ + subdir = benchmarks + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -48,10 +44,7 @@ CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -77,8 +70,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -89,20 +80,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -124,6 +106,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -139,25 +122,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -171,6 +150,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -181,7 +161,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -197,6 +176,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -210,6 +191,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -217,6 +199,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) +@@ -268,10 +252,6 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -280,22 +260,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -340,7 +319,7 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -354,12 +333,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -378,17 +365,21 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am ++ uninstall uninstall-am + + + #threads_SOURCES = threads.c benchmarks.c benchmarks.h +Index: elektra-0.7.0rc5/configure +=================================================================== +--- elektra-0.7.0rc5.orig/configure ++++ elektra-0.7.0rc5/configure +@@ -830,6 +830,7 @@ INSTALL + INSTALL_PROGRAM + INSTALL_SCRIPT + INSTALL_DATA ++am__isrc + CYGPATH_W + PACKAGE + VERSION +@@ -848,25 +849,8 @@ am__leading_dot + AMTAR + am__tar + am__untar +-CC +-CFLAGS +-LDFLAGS +-CPPFLAGS +-ac_ct_CC +-EXEEXT +-OBJEXT +-DEPDIR +-am__include +-am__quote +-AMDEP_TRUE +-AMDEP_FALSE +-AMDEPBACKSLASH +-CCDEPMODE +-am__fastdepCC_TRUE +-am__fastdepCC_FALSE +-CPP +-GREP +-EGREP ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE + DEBUG_TRUE + DEBUG_FALSE + EXPERIMENTAL_TRUE +@@ -889,6 +873,22 @@ develdocdir + default_docbook + default_backend + default_dbackend ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE + LN_S + SED + NM +@@ -896,6 +896,8 @@ LTDLINCL + LIBLTDL + subdirs + PKG_CONFIG ++GREP ++EGREP + ECHO + AR + RANLIB +@@ -904,6 +906,7 @@ NMEDIT + DLLTOOL + AS + OBJDUMP ++CPP + CXX + CXXFLAGS + ac_ct_CXX +@@ -927,12 +930,11 @@ HAVE_DOXYGEN_TRUE + HAVE_DOXYGEN_FALSE + LIBICONV + LTLIBICONV +-XML2_CONFIG +-XML_CPPFLAGS +-XML_LIBS ++REQUIRES_LIBXML2 ++libxml2_CFLAGS ++libxml2_LIBS + HAVE_XML_TRUE + HAVE_XML_FALSE +-elektratools + gconf_CFLAGS + gconf_LIBS + BACKENDS +@@ -951,14 +953,16 @@ CFLAGS + LDFLAGS + LIBS + CPPFLAGS +-CPP + PKG_CONFIG ++CPP + CXX + CXXFLAGS + CCC + CXXCPP + F77 + FFLAGS ++libxml2_CFLAGS ++libxml2_LIBS + gconf_CFLAGS + gconf_LIBS' + ac_subdirs_all='libltdl' +@@ -1541,14 +1545,14 @@ if test -n "$ac_init_help"; then + Optional Features: + --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-debug turn on debug symbols and enable debug messages + [default=no] + --enable-experimental Specify to compile or not experimental parts (could + cause compilation failure) [default=no] + --enable-valgrind-tests run self tests under valgrind [default=no] + --enable-gcov turn on code coverage analysis tools [default=no] ++ --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=yes] + --enable-fast-install[=PKGS] +@@ -1556,7 +1560,6 @@ Optional Features: + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-iconv turns on automatic UTF-8 conversions. [default=no] + --disable-rpath do not hardcode runtime library paths +- --disable-xmltest Do not try to compile and run a test LIBXML program + --enable-filesys compile filesys backend [default=YES] + --enable-hosts compile hosts backend [default=YES] + --enable-ini compile ini backend [default=NO] +@@ -1602,8 +1605,6 @@ Optional Packages: + --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir +- --with-xml-prefix=PFX Prefix where libxml is installed (optional) +- --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional) + + Some influential environment variables: + CC C compiler command +@@ -1613,13 +1614,17 @@ Some influential environment variables: + LIBS libraries to pass to the linker, e.g. -l<library> + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> +- CPP C preprocessor + PKG_CONFIG path to pkg-config utility ++ CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags ++ libxml2_CFLAGS ++ C compiler flags for libxml2, overriding pkg-config ++ libxml2_LIBS ++ linker flags for libxml2, overriding pkg-config + gconf_CFLAGS + C compiler flags for gconf, overriding pkg-config + gconf_LIBS linker flags for gconf, overriding pkg-config +@@ -2245,7 +2250,8 @@ INSTALL='\$(install_sh)' + + + +-am__api_version="1.9" ++am__api_version='1.10' ++ + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -2397,38 +2403,53 @@ else + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" + else +- mkdir_p='$(install_sh) -d' ++ # As a last resort, use the slow shell script. Don't cache a ++ # 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 ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + + for ac_prog in gawk mawk nawk awk + do +@@ -2511,12 +2532,16 @@ else + fi + rmdir .tst 2>/dev/null + +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } ++ fi + fi + + # test whether we have cygpath +@@ -2559,7 +2584,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2663,7 +2688,7 @@ else + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -2680,126 +2705,126 @@ am__tar='${AMTAR} chof - "$$tardir"'; am + ac_config_headers="$ac_config_headers src/include/config.h" + + +-DEPDIR="${am__leading_dot}deps" ++gl_USE_SYSTEM_EXTENSIONS + +-ac_config_commands="$ac_config_commands depfiles" ++#Check whether we are compiling for win32 ++case $host_os in ++mingw* | pw32*) ++ # If compiling for windows we need HAVE_WIN32 defined + ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_WIN32 1 ++_ACEOF + +-am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++esac ++ ++# Disable libtool static lib ++#AC_DISABLE_STATIC ++ ++ if test x$enable_static = xyes; then ++ ENABLE_STATIC_TRUE= ++ ENABLE_STATIC_FALSE='#' ++else ++ ENABLE_STATIC_TRUE='#' ++ ENABLE_STATIC_FALSE= + fi + + +-{ echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6; } +-rm -f confinc confmf + +-# Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then +- enableval=$enable_dependency_tracking; +-fi + +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi + ++# ++# Compile and test specific flags. ++# + +-if test "x$enable_dependency_tracking" != xno; then +- AMDEP_TRUE= +- AMDEP_FALSE='#' +-else +- AMDEP_TRUE='#' +- AMDEP_FALSE= ++{ echo "$as_me:$LINENO: checking whether to enable debugging and take control over compiler flags" >&5 ++echo $ECHO_N "checking whether to enable debugging and take control over compiler flags... $ECHO_C" >&6; } ++# Check whether --enable-debug was given. ++if test "${enable_debug+set}" = set; then ++ enableval=$enable_debug; + fi + + ++COPTFLAGS="-O2" ++CXXOPTFLAGS="-O2" ++ ++if test "x$enable_debug" = "xyes"; ++then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++ CSTDFLAGS="-std=c99 -ansi -pedantic" ++ COPTFLAGS="-O0" ++ CDBGFLAGS="-g -ggdb -DDEBUG -Wall -Werror" ++ ++ CXXSTDFLAGS="-std=c++98 -ansi -pedantic" ++ CXXOPTFLAGS="-O0" ++ CXXDBGFLAGS="-g -ggdb -DDEBUG -O0 -Wall -Werror" ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define DEBUG 1 ++_ACEOF + +-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 +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++#take control over FLAGS ++#AM_CONDITIONAL (USE_FLAGS, [test "x$enable_debug" = "xyes" ]) ++ if test x$enable_debug = xyes; then ++ DEBUG_TRUE= ++ DEBUG_FALSE='#' + 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_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- ++ DEBUG_TRUE='#' ++ DEBUG_FALSE= + fi ++ ++ ++ ++# Enable compilation of experimental things (unfinished ++# backends at this time) ++# Check whether --enable-experimental was given. ++if test "${enable_experimental+set}" = set; then ++ enableval=$enable_experimental; elektra_experimental=$enableval ++else ++ elektra_experimental=no + fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ ++# for the c++ binding ++ if test "x$elektra_experimental" = "xyes" ; then ++ EXPERIMENTAL_TRUE= ++ EXPERIMENTAL_FALSE='#' + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ EXPERIMENTAL_TRUE='#' ++ EXPERIMENTAL_FALSE= + fi + + ++ ++# Run self-tests under valgrind? ++{ echo "$as_me:$LINENO: checking whether self tests are run under valgrind" >&5 ++echo $ECHO_N "checking whether self tests are run under valgrind... $ECHO_C" >&6; } ++# Check whether --enable-valgrind-tests was given. ++if test "${enable_valgrind_tests+set}" = set; then ++ enableval=$enable_valgrind_tests; + fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 ++ ++if test "x$enable_valgrind_tests" = "xyes"; ++then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ for ac_prog in valgrind ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_VALGRIND+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++ if test -n "$VALGRIND"; then ++ ac_cv_prog_VALGRIND="$VALGRIND" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -2808,7 +2833,7 @@ do + 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_CC="gcc" ++ ac_cv_prog_VALGRIND="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -2818,144 +2843,56 @@ IFS=$as_save_IFS + + fi + fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++VALGRIND=$ac_cv_prog_VALGRIND ++if test -n "$VALGRIND"; then ++ { echo "$as_me:$LINENO: result: $VALGRIND" >&5 ++echo "${ECHO_T}$VALGRIND" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-else +- CC="$ac_cv_prog_CC" +-fi + +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done ++ test -n "$VALGRIND" && break + done +-IFS=$as_save_IFS + +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 ++ { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi ++ if test "x$enable_valgrind_tests" = "xyes" ; then ++ VALGRINDTESTS_TRUE= ++ VALGRINDTESTS_FALSE='#' ++else ++ VALGRINDTESTS_TRUE='#' ++ VALGRINDTESTS_FALSE= ++fi + + +- fi +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-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 +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++{ echo "$as_me:$LINENO: checking whether to enable gcov" >&5 ++echo $ECHO_N "checking whether to enable gcov... $ECHO_C" >&6; } ++# Check whether --enable-gcov was given. ++if test "${enable_gcov+set}" = set; then ++ enableval=$enable_gcov; + fi + + +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl.exe +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++if test "x$enable_gcov" = "xyes"; ++then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ for ac_prog in lcov ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_LCOV+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. ++ 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 +@@ -2964,7 +2901,7 @@ do + 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_CC="$ac_tool_prefix$ac_prog" ++ ac_cv_prog_LCOV="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -2974,32 +2911,31 @@ IFS=$as_save_IFS + + fi + fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++LCOV=$ac_cv_prog_LCOV ++if test -n "$LCOV"; then ++ { echo "$as_me:$LINENO: result: $LCOV" >&5 ++echo "${ECHO_T}$LCOV" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + + +- test -n "$CC" && break +- done +-fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl.exe ++ test -n "$LCOV" && break ++done ++test -n "$LCOV" || LCOV="false" ++ ++ for ac_prog in genhtml + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_GENHTML+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++ 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 +@@ -3008,7 +2944,7 @@ do + 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_CC="$ac_prog" ++ ac_cv_prog_GENHTML="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -3018,1187 +2954,710 @@ IFS=$as_save_IFS + + fi + fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++GENHTML=$ac_cv_prog_GENHTML ++if test -n "$GENHTML"; then ++ { echo "$as_me:$LINENO: result: $GENHTML" >&5 ++echo "${ECHO_T}$GENHTML" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + + +- test -n "$ac_ct_CC" && break ++ test -n "$GENHTML" && break + done ++test -n "$GENHTML" || GENHTML="false" + +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-fi + ++ CDBGFLAGS="$CDBGFLAGS -fprofile-arcs -ftest-coverage" ++ CXXDBGFLAGS="$CXXDBGFLAGS -fprofile-arcs -ftest-coverage" ++ ++ LDFLAGS="$LDFLAGS -lgcov" ++ ++ COPTFLAGS="-O0" ++ CXXOPTFLAGS="-O0" ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } + +-# Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ + +- ; +- return 0; +-} +-_ACEOF +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" +-# Try to create an executable without -o first, disregard a.out. +-# It will help us diagnose broken compilers, and finding out an intuition +-# of exeext. +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++ ++ ++ ++ ++ ++ ++ + # +-# List of possible output files, starting from the most likely. +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +-# only as a last resort. b.out is created by i960 compilers. +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# set some custom path + # +-# The IRIX 6 linker writes into existing files which may not be +-# executable, retaining their permissions. Remove them first so a +-# subsequent execution test works. +-ac_rmfiles= +-for ac_file in $ac_files +-do +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; +- * ) ac_rmfiles="$ac_rmfiles $ac_file";; +- esac +-done +-rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link_default") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +-# in a Makefile. We should not override ac_cv_exeext if it was cached, +-# so that the user can short-circuit this test for compilers unknown to +-# Autoconf. +-for ac_file in $ac_files '' +-do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) +- ;; +- [ab].out ) +- # We found the default executable, but exeext='' is most +- # certainly right. +- break;; +- *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; +- then :; else +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- fi +- # We set ac_cv_exeext here because the later test for it is not +- # safe: cross compilers may not add the suffix if given an `-o' +- # argument, so we may need to know it at that point already. +- # Even if this section looks crufty: it has the advantage of +- # actually working. +- break;; +- * ) +- break;; +- esac +-done +-test "$ac_cv_exeext" = no && ac_cv_exeext= ++# usr/lib path ++echo "LIBDIR=$libdir" + ++# Check whether --with-ulibdir was given. ++if test "${with_ulibdir+set}" = set; then ++ withval=$with_ulibdir; ulibdir=$withval + else +- ac_file='' ++ ulibdir='${prefix}/'`basename $libdir` ++ + fi + +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } +-if test -z "$ac_file"; then +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } +-fi + +-ac_exeext=$ac_cv_exeext ++# backend dlopended libraries path ++ ++# Check whether --with-backenddir was given. ++if test "${with_backenddir+set}" = set; then ++ withval=$with_backenddir; backenddir=$withval ++else ++ backenddir='${libdir}/elektra' + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi + fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } + +-rm -f a.out a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6; } + +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # If both `conftest.exe' and `conftest' are `present' (well, observable) +-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +-# work properly (i.e., refer to `conftest.exe'), while it won't with +-# `rm'. +-for ac_file in conftest.exe conftest conftest.*; do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; +- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- break;; +- * ) break;; +- esac +-done ++ ++# high level backend dlopended libraries path ++ ++# Check whether --with-hlvlbackenddir was given. ++if test "${with_hlvlbackenddir+set}" = set; then ++ withval=$with_hlvlbackenddir; hlvlbackenddir=$withval + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ hlvlbackenddir='${ulibdir}/elektra' ++ + fi + +-rm -f conftest$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6; } + +-rm -f conftest.$ac_ext +-EXEEXT=$ac_cv_exeext +-ac_exeext=$EXEEXT +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +-if test "${ac_cv_objext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ ++# /usr/share/doc path + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- for ac_file in conftest.o conftest.obj conftest.*; do +- test -f "$ac_file" || continue; +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; +- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +- break;; +- esac +-done ++# Check whether --with-docdir was given. ++if test "${with_docdir+set}" = set; then ++ withval=$with_docdir; docdir=$withval + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ docdir='${datadir}/doc/elektra' + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } + fi + +-rm -f conftest.$ac_cv_objext conftest.$ac_ext +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6; } +-OBJEXT=$ac_cv_objext +-ac_objext=$OBJEXT +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_compiler_gnu=yes ++# /usr/share/doc/elektra-api ++ ++# Check whether --with-develdocdir was given. ++if test "${with_develdocdir+set}" = set; then ++ withval=$with_develdocdir; develdocdir=$withval + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ develdocdir='${datadir}/doc/elektra-devel' + +- ac_compiler_gnu=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu + +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` +-ac_test_CFLAGS=${CFLAGS+set} +-ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_save_c_werror_flag=$ac_c_werror_flag +- ac_c_werror_flag=yes +- ac_cv_prog_cc_g=no +- CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ ++# Select docbook.xsl + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cc_g=yes ++# Check whether --with-docbook was given. ++if test "${with_docbook+set}" = set; then ++ withval=$with_docbook; default_docbook=$withval + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ default_docbook=/usr/share/sgml/docbook/xsl-stylesheets + +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++fi + +-int +-main () +-{ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : ++ ++# sgml/elektra-<VERSION> ++ ++# Check whether --with-kdbschema was given. ++if test "${with_kdbschema+set}" = set; then ++ withval=$with_kdbschema; kdbschemadir=$withval + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ kdbschemadir="/sgml/elektra-$PACKAGE_VERSION" + +- ac_c_werror_flag=$ac_save_c_werror_flag +- CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++fi + +-int +-main () +-{ + +- ; +- return 0; +-} ++cat >>confdefs.h <<_ACEOF ++#define KDB_SCHEMA_PATH DATADIR "${kdbschemadir}" + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + + +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi ++# Default backend selection (Set to 'filesys' as default) + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi ++# Check whether --with-backend was given. ++if test "${with_backend+set}" = set; then ++ withval=$with_backend; default_backend=$withval ++else ++ default_backend=filesys + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi ++ ++ ++ ++# Default daemon backend selection (Set to 'berkeleydb' as default) ++ ++# Check whether --with-dbackend was given. ++if test "${with_dbackend+set}" = set; then ++ withval=$with_dbackend; default_dbackend=$withval + else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi ++ default_dbackend=berkeleydb ++ + fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_prog_cc_c89=no +-ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdarg.h> +-#include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} + +-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +- function prototypes and stuff, but not '\xHH' hex character constants. +- These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std is added to get +- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +- array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std. */ +-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters +- inside strings and character constants. */ +-#define FOO(x) 'x' +-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int +-main () +-{ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; +- return 0; +-} +-_ACEOF +-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ +- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cc_c89=$ac_arg +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + + +-fi + +-rm -f core conftest.err conftest.$ac_objext +- test "x$ac_cv_prog_cc_c89" != "xno" && break +-done +-rm -f conftest.$ac_ext +-CC=$ac_save_CC + +-fi +-# AC_CACHE_VAL +-case "x$ac_cv_prog_cc_c89" in +- x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; +- xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; +- *) +- CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +-esac + + ++# ++# Checks for needed programs. ++# ++ + 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 +- +-depcc="$CC" am_compiler_list= +- +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_CC_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_CC_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done ++done ++done ++IFS=$as_save_IFS + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CC_dependencies_compiler_type=none + fi +- + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + + ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + +-if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then +- am__fastdepCC_TRUE= +- am__fastdepCC_FALSE='#' ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- am__fastdepCC_TRUE='#' +- am__fastdepCC_FALSE= ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + 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 +-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" + fi +-if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # 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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- # Broken: success on invalid input. +-continue ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +- +-rm -f conftest.err conftest.$ac_ext +- ++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_CC="${ac_tool_prefix}cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi + 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 ++done ++IFS=$as_save_IFS + + fi +- CPP=$ac_cv_prog_CPP +-else +- ac_cv_prog_CPP=$CPP +-fi +-{ echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # 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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- # Broken: success on invalid input. +-continue ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Passes both tests. +-ac_preproc_ok=: +-break ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + 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 +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ fi + 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 +- +- +-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # Extract the first word of "grep ggrep" to use in msg output +-if test -z "$GREP"; then +-set dummy grep ggrep; ac_prog_name=$2 +-if test "${ac_cv_path_GREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else +- ac_path_GREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST ++ ac_prog_rejected=no + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +- # Check for GNU ac_path_GREP and select it if it is found. +- # Check for GNU $ac_path_GREP +-case `"$ac_path_GREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +-*) +- ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- echo 'GREP' >> "conftest.nl" +- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_GREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_GREP="$ac_path_GREP" +- ac_path_GREP_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_GREP_found && break 3 +- done ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi + done +- + done + IFS=$as_save_IFS + +- ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $# != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi + fi +- +-GREP="$ac_cv_path_GREP" +-if test -z "$GREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } + fi +- ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- ac_cv_path_GREP=$GREP ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +- GREP="$ac_cv_path_GREP" +- +- +-{ echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +- then ac_cv_path_EGREP="$GREP -E" +- else +- # Extract the first word of "egrep" to use in msg output +-if test -z "$EGREP"; then +-set dummy egrep; ac_prog_name=$2 +-if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else +- ac_path_EGREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +- # Check for GNU ac_path_EGREP and select it if it is found. +- # Check for GNU $ac_path_EGREP +-case `"$ac_path_EGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +-*) +- ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- echo 'EGREP' >> "conftest.nl" +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_EGREP="$ac_path_EGREP" +- ac_path_EGREP_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 ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + +- $ac_path_EGREP_found && break 3 ++ ++ test -n "$CC" && break + done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi + done +- + done + IFS=$as_save_IFS + +- + fi +- +-EGREP="$ac_cv_path_EGREP" +-if test -z "$EGREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } + fi +- ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- ac_cv_path_EGREP=$EGREP ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +- fi ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +- EGREP="$ac_cv_path_EGREP" + + ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } + +-{ echo "$as_me:$LINENO: checking for AIX" >&5 +-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#ifdef _AIX +- yes +-#endif + ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-cat >>confdefs.h <<\_ACEOF +-#define _ALL_SOURCE 1 +-_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++test "$ac_cv_exeext" = no && ac_cv_exeext= + + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ ac_file='' + fi +-rm -f conftest* + ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C compiler cannot create executables ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++fi ++ ++ac_exeext=$ac_cv_exeext ++ ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } ++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 ++# If not cross compiling, check that we can run a simple program. ++if test "$cross_compiling" != yes; then ++ if { ac_try='./$ac_file' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ fi ++fi ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++rm -f a.out a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest$ac_cv_exeext ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } ++if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -4207,10 +3666,6 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> + + int + main () +@@ -4220,6 +3675,65 @@ main () + return 0; + } + _ACEOF ++rm -f conftest.o conftest.obj ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in +@@ -4237,168 +3751,47 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_cv_header_stdc=yes ++ ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_stdc=no ++ ac_compiler_gnu=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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* 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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* 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* ++ac_cv_c_compiler_gnu=$ac_compiler_gnu + + 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 +- : ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* 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 +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_header_stdc=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +-fi +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF +- +-fi +- +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in +@@ -4416,49 +3809,26 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" ++ ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-if test "${ac_cv_header_minix_config_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for minix/config.h" >&5 +-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_minix_config_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 +-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5 +-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <minix/config.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -4477,155 +3847,148 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes ++ : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5 +-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <minix/config.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------------------- ## +-## Report this to http://bugs.libelektra.org ## +-## ----------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5 +-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_minix_config_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_minix_config_h=$ac_header_preproc + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 +-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; } + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-if test $ac_cv_header_minix_config_h = yes; then +- MINIX=yes +-else +- MINIX= +-fi +- +- +-if test "$MINIX" = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define _POSIX_SOURCE 1 +-_ACEOF +- +- +-cat >>confdefs.h <<\_ACEOF +-#define _POSIX_1_SOURCE 2 +-_ACEOF +- +- +-cat >>confdefs.h <<\_ACEOF +-#define _MINIX 1 +-_ACEOF ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag + fi +- +- +- +- +- +- +- +- +- +- +- { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 +-echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; } +-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +- #define __EXTENSIONS__ 1 +- $ac_includes_default ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; + int + main () + { +- ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -4642,257 +4005,442 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_cv_safe_to_define___extensions__=yes ++ ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_safe_to_define___extensions__=no +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 +-echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; } +- test $ac_cv_safe_to_define___extensions__ = yes && +- cat >>confdefs.h <<\_ACEOF +-#define __EXTENSIONS__ 1 +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define _POSIX_PTHREAD_SEMANTICS 1 +-_ACEOF +- +- +- +-#Check whether we are compiling for win32 +-case $host_os in +-mingw* | pw32*) +- # If compiling for windows we need HAVE_WIN32 defined +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_WIN32 1 +-_ACEOF +- +-esac +- +-# Disable libtool static lib +-#AC_DISABLE_STATIC +- +- +- + ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC + +- +-# +-# Compile and test specific flags. +-# +- +-{ echo "$as_me:$LINENO: checking whether to enable debugging and take control over compiler flags" >&5 +-echo $ECHO_N "checking whether to enable debugging and take control over compiler flags... $ECHO_C" >&6; } +-# Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then +- enableval=$enable_debug; + fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++esac + + +-COPTFLAGS="-O2" +-CXXOPTFLAGS="-O2" +- +-if test "x$enable_debug" = "xyes"; +-then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- +- CSTDFLAGS="-std=c99 -ansi -pedantic" +- COPTFLAGS="-O0" +- CDBGFLAGS="-g -ggdb -DDEBUG -Wall -Werror" +- +- CXXSTDFLAGS="-std=c++98 -ansi -pedantic" +- CXXOPTFLAGS="-O0" +- CXXDBGFLAGS="-g -ggdb -DDEBUG -O0 -Wall -Werror" ++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 ++DEPDIR="${am__leading_dot}deps" + ++ac_config_commands="$ac_config_commands depfiles" + +-cat >>confdefs.h <<\_ACEOF +-#define DEBUG 1 +-_ACEOF + +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU + fi +-#take control over FLAGS +-#AM_CONDITIONAL (USE_FLAGS, [test "x$enable_debug" = "xyes" ]) +- +- +-if test x$enable_debug = xyes; then +- DEBUG_TRUE= +- DEBUG_FALSE='#' +-else +- DEBUG_TRUE='#' +- DEBUG_FALSE= ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi + fi + + ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } ++rm -f confinc confmf + +-# Enable compilation of experimental things (unfinished +-# backends at this time) +-# Check whether --enable-experimental was given. +-if test "${enable_experimental+set}" = set; then +- enableval=$enable_experimental; elektra_experimental=$enableval +-else +- elektra_experimental=no ++# Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then ++ enableval=$enable_dependency_tracking; + fi + +-# for the c++ binding +- +- +-if test "x$elektra_experimental" = "xyes" ; then +- EXPERIMENTAL_TRUE= +- EXPERIMENTAL_FALSE='#' ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++ if test "x$enable_dependency_tracking" != xno; then ++ AMDEP_TRUE= ++ AMDEP_FALSE='#' + else +- EXPERIMENTAL_TRUE='#' +- EXPERIMENTAL_FALSE= ++ AMDEP_TRUE='#' ++ AMDEP_FALSE= + fi + + + +-# Run self-tests under valgrind? +-{ echo "$as_me:$LINENO: checking whether self tests are run under valgrind" >&5 +-echo $ECHO_N "checking whether self tests are run under valgrind... $ECHO_C" >&6; } +-# Check whether --enable-valgrind-tests was given. +-if test "${enable_valgrind_tests+set}" = set; then +- enableval=$enable_valgrind_tests; +-fi ++depcc="$CC" am_compiler_list= + +-if test "x$enable_valgrind_tests" = "xyes"; +-then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- for ac_prog in valgrind +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_VALGRIND+set}" = set; then ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$VALGRIND"; then +- ac_cv_prog_VALGRIND="$VALGRIND" # 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_VALGRIND="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi +-done +-done +-IFS=$as_save_IFS ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none + fi ++ + fi +-VALGRIND=$ac_cv_prog_VALGRIND +-if test -n "$VALGRIND"; then +- { echo "$as_me:$LINENO: result: $VALGRIND" >&5 +-echo "${ECHO_T}$VALGRIND" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= + fi + + +- test -n "$VALGRIND" && break +-done +- ++if test "x$CC" != xcc; then ++ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 ++echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 ++echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } + fi ++set dummy $CC; ac_cc=`echo $2 | ++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + ++int ++main () ++{ + +-if test "x$enable_valgrind_tests" = "xyes" ; then +- VALGRINDTESTS_TRUE= +- VALGRINDTESTS_FALSE='#' ++ ; ++ return 0; ++} ++_ACEOF ++# Make sure it works both with $CC and with simple cc. ++# We do the test twice because some compilers refuse to overwrite an ++# existing .o file with -o, though they will create one. ++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ++rm -f conftest2.* ++if { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ test -f conftest2.$ac_objext && { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; ++then ++ eval ac_cv_prog_cc_${ac_cc}_c_o=yes ++ if test "x$CC" != xcc; then ++ # Test first that cc exists at all. ++ if { ac_try='cc -c conftest.$ac_ext >&5' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ++ rm -f conftest2.* ++ if { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ test -f conftest2.$ac_objext && { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; ++ then ++ # cc works too. ++ : ++ else ++ # cc exists but doesn't like -o. ++ eval ac_cv_prog_cc_${ac_cc}_c_o=no ++ fi ++ fi ++ fi + else +- VALGRINDTESTS_TRUE='#' +- VALGRINDTESTS_FALSE= ++ eval ac_cv_prog_cc_${ac_cc}_c_o=no ++fi ++rm -f core conftest* ++ + fi ++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ++cat >>confdefs.h <<\_ACEOF ++#define NO_MINUS_C_MINUS_O 1 ++_ACEOF + ++fi + +-{ echo "$as_me:$LINENO: checking whether to enable gcov" >&5 +-echo $ECHO_N "checking whether to enable gcov... $ECHO_C" >&6; } +-# Check whether --enable-gcov was given. +-if test "${enable_gcov+set}" = set; then +- enableval=$enable_gcov; ++# FIXME: we rely on the cache variable name because ++# there is no other way. ++set dummy $CC ++ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" + fi + + +-if test "x$enable_gcov" = "xyes"; +-then +- { echo "$as_me:$LINENO: result: yes" >&5 ++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } ++LN_S=$as_ln_s ++if test "$LN_S" = "ln -s"; then ++ { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } +- for ac_prog in lcov +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_LCOV+set}" = set; then ++else ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } ++fi ++ ++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } ++if test "${ac_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$LCOV"; then +- ac_cv_prog_LCOV="$LCOV" # Let the user override the test. ++ 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" | sed 99q >conftest.sed ++ $as_unset ac_script || ac_script= ++ # Extract the first word of "sed gsed" to use in msg output ++if test -z "$SED"; then ++set dummy sed gsed; ac_prog_name=$2 ++if test "${ac_cv_path_SED+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ 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 +- 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="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi ++ 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 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ 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 ++ ac_count=`expr $ac_count + 1` ++ 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 + ++ + fi ++ ++SED="$ac_cv_path_SED" ++if test -z "$SED"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} ++ { (exit 1); exit 1; }; } + fi +-LCOV=$ac_cv_prog_LCOV +-if test -n "$LCOV"; then +- { echo "$as_me:$LINENO: result: $LCOV" >&5 +-echo "${ECHO_T}$LCOV" >&6; } ++ + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ ac_cv_path_SED=$SED + fi + ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++echo "${ECHO_T}$ac_cv_path_SED" >&6; } ++ SED="$ac_cv_path_SED" ++ rm -f conftest.sed + +- test -n "$LCOV" && break +-done +-test -n "$LCOV" || LCOV="false" +- +- for ac_prog in genhtml +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 ++# Extract the first word of "nm", so it can be a program name with args. ++set dummy nm; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_GENHTML+set}" = set; then ++if test "${ac_cv_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$GENHTML"; then +- ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. ++ if test -n "$NM"; then ++ ac_cv_prog_NM="$NM" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -4901,7 +4449,7 @@ do + 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="$ac_prog" ++ ac_cv_prog_NM="nm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -4909,200 +4457,173 @@ done + done + IFS=$as_save_IFS + ++ test -z "$ac_cv_prog_NM" && ac_cv_prog_NM="nm-is-missing" + fi + fi +-GENHTML=$ac_cv_prog_GENHTML +-if test -n "$GENHTML"; then +- { echo "$as_me:$LINENO: result: $GENHTML" >&5 +-echo "${ECHO_T}$GENHTML" >&6; } ++NM=$ac_cv_prog_NM ++if test -n "$NM"; then ++ { echo "$as_me:$LINENO: result: $NM" >&5 ++echo "${ECHO_T}$NM" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + + +- test -n "$GENHTML" && break +-done +-test -n "$GENHTML" || GENHTML="false" +- +- +- CDBGFLAGS="$CDBGFLAGS -fprofile-arcs -ftest-coverage" +- CXXDBGFLAGS="$CXXDBGFLAGS -fprofile-arcs -ftest-coverage" +- +- LDFLAGS="$LDFLAGS -lgcov" +- +- COPTFLAGS="-O0" +- CXXOPTFLAGS="-O0" ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- { echo "$as_me:$LINENO: result: no" >&5 ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh ++all: ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF ++# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make ++fi ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ SET_MAKE= ++else ++ { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" + fi + + ++# Don't use libltdl stuff for WIN32 ++case $host_os in ++ pw32* | mingw*) ++ ;; ++ *) + ++ { echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5 ++echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lltdl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char lt_dlinit (); ++int ++main () ++{ ++return lt_dlinit (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_ltdl_lt_dlinit=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_cv_lib_ltdl_lt_dlinit=no ++fi + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5 ++echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; } ++if test $ac_cv_lib_ltdl_lt_dlinit = yes; then ++ test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no ++else ++ if test x"$enable_ltdl_install" = xno; then ++ { echo "$as_me:$LINENO: WARNING: libltdl not installed, but installation disabled" >&5 ++echo "$as_me: WARNING: libltdl not installed, but installation disabled" >&2;} ++ else ++ enable_ltdl_install=yes ++ fi + ++fi + ++ if test x"$enable_ltdl_install" = x"yes"; then ++ ac_configure_args="$ac_configure_args --enable-ltdl-install" ++ LIBLTDL='${top_builddir}/''libltdl'/libltdl.la ++ LTDLINCL='-I${top_srcdir}/''libltdl' ++ else ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= ++ fi ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" + + + + + ++ subdirs="$subdirs libltdl" + +-# +-# set some custom path +-# +- +-# usr/lib path +-echo "LIBDIR=$libdir" +- +-# Check whether --with-ulibdir was given. +-if test "${with_ulibdir+set}" = set; then +- withval=$with_ulibdir; ulibdir=$withval +-else +- ulibdir='${prefix}/'`basename $libdir` +- +-fi +- ++ ;; ++esac + + +-# backend dlopended libraries path +- +-# Check whether --with-backenddir was given. +-if test "${with_backenddir+set}" = set; then +- withval=$with_backenddir; backenddir=$withval +-else +- backenddir='${libdir}/elektra' +- +-fi +- +- +- +-# high level backend dlopended libraries path +- +-# Check whether --with-hlvlbackenddir was given. +-if test "${with_hlvlbackenddir+set}" = set; then +- withval=$with_hlvlbackenddir; hlvlbackenddir=$withval +-else +- hlvlbackenddir='${ulibdir}/elektra' +- +-fi +- +- +- +-# /usr/share/doc path +- +-# Check whether --with-docdir was given. +-if test "${with_docdir+set}" = set; then +- withval=$with_docdir; docdir=$withval +-else +- docdir='${datadir}/doc/elektra' +- +-fi +- +- +- +-# /usr/share/doc/elektra-api +- +-# Check whether --with-develdocdir was given. +-if test "${with_develdocdir+set}" = set; then +- withval=$with_develdocdir; develdocdir=$withval +-else +- develdocdir='${datadir}/doc/elektra-devel' +- +-fi +- +- +- +-# Select docbook.xsl +- +-# Check whether --with-docbook was given. +-if test "${with_docbook+set}" = set; then +- withval=$with_docbook; default_docbook=$withval +-else +- default_docbook=/usr/share/sgml/docbook/xsl-stylesheets +- +-fi +- +- +- +-# sgml/elektra-<VERSION> +- +-# Check whether --with-kdbschema was given. +-if test "${with_kdbschema+set}" = set; then +- withval=$with_kdbschema; kdbschemadir=$withval +-else +- kdbschemadir="/sgml/elektra-$PACKAGE_VERSION" +- +-fi +- +- +-cat >>confdefs.h <<_ACEOF +-#define KDB_SCHEMA_PATH DATADIR "${kdbschemadir}" +-_ACEOF +- +- +- +-# Default backend selection (Set to 'filesys' as default) +- +-# Check whether --with-backend was given. +-if test "${with_backend+set}" = set; then +- withval=$with_backend; default_backend=$withval +-else +- default_backend=filesys +- +-fi +- +- +- +-# Default daemon backend selection (Set to 'berkeleydb' as default) +- +-# Check whether --with-dbackend was given. +-if test "${with_dbackend+set}" = set; then +- withval=$with_dbackend; default_dbackend=$withval +-else +- default_dbackend=berkeleydb +- +-fi +- +- +- +- +- +- +- +- +- +-# +-# Checks for needed programs. +-# +- +-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 +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++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 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ 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_prog_CC="${ac_tool_prefix}gcc" ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5110,12 +4631,13 @@ done + done + IFS=$as_save_IFS + ++ ;; ++esac + fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +@@ -5123,26 +4645,28 @@ fi + + + fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 ++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 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ 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_prog_ac_ct_CC="gcc" ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5150,19 +4674,20 @@ done + done + IFS=$as_save_IFS + ++ ;; ++esac + fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + +- if test "x$ac_ct_CC" = x; then +- CC="" ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -5174,1863 +4699,1466 @@ whose name does not start with the host + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac +- CC=$ac_ct_CC ++ PKG_CONFIG=$ac_pt_PKG_CONFIG + fi + else +- CC="$ac_cv_prog_CC" ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + fi + +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- + fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ PKG_CONFIG="" ++ fi ++ + fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++# 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 +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ enable_shared=yes + fi + + +- 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=yes + fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++ ++# Check whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=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_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac + else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. ++ enable_fast_install=yes ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } ++if test "${lt_cv_path_SED+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_prog_rejected=no ++ # Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. + 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 +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done ++ done + done + IFS=$as_save_IFS +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break + fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++ + fi + ++SED=$lt_cv_path_SED + +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl.exe +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++{ echo "$as_me:$LINENO: result: $SED" >&5 ++echo "${ECHO_T}$SED" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ ac_path_GREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ # Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_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_GREP_found && break 3 ++ done + done ++ + done + IFS=$as_save_IFS + ++ + fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } + fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ ac_cv_path_GREP=$GREP + fi + + +- test -n "$CC" && break +- done + fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl.exe +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ ac_path_EGREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ # Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_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 + +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi + ++ $ac_path_EGREP_found && break 3 ++ done ++done + +- test -n "$ac_ct_CC" && break + done ++IFS=$as_save_IFS ++ + +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi + fi + ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } + fi + ++else ++ ac_cv_path_EGREP=$EGREP ++fi + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } + +-# Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" + +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_compiler_gnu=yes ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ with_gnu_ld=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu +- ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++else ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` +-ac_test_CFLAGS=${CFLAGS+set} +-ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_c_werror_flag=$ac_c_werror_flag +- ac_c_werror_flag=yes +- ac_cv_prog_cc_g=no +- CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ ++ if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break ++ ;; ++ *) ++ test "$with_gnu_ld" != yes && break ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++else ++ lt_cv_path_LD="$LD" # Let the user override the test with a path. ++fi ++fi + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_c_werror_flag=$ac_save_c_werror_flag +- CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_c_werror_flag=$ac_save_c_werror_flag +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_prog_cc_c89=no +-ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdarg.h> +-#include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +- +-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +- function prototypes and stuff, but not '\xHH' hex character constants. +- These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std is added to get +- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +- array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std. */ +-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +- +-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters +- inside strings and character constants. */ +-#define FOO(x) 'x' +-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +- +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int +-main () +-{ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; +- return 0; +-} +-_ACEOF +-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ +- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cc_c89=$ac_arg +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext +- test "x$ac_cv_prog_cc_c89" != "xno" && break +-done +-rm -f conftest.$ac_ext +-CC=$ac_save_CC +- +-fi +-# AC_CACHE_VAL +-case "x$ac_cv_prog_cc_c89" in +- x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; +- xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; +- *) +- CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +-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 +- +-depcc="$CC" am_compiler_list= +- +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_CC_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_CC_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CC_dependencies_compiler_type=none +-fi +- +-fi +-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type +- +- +- +-if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then +- am__fastdepCC_TRUE= +- am__fastdepCC_FALSE='#' +-else +- am__fastdepCC_TRUE='#' +- am__fastdepCC_FALSE= +-fi +- +- +-if test "x$CC" != xcc; then +- { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 +-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } +-else +- { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 +-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } +-fi +-set dummy $CC; ac_cc=`echo $2 | +- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-# Make sure it works both with $CC and with simple cc. +-# We do the test twice because some compilers refuse to overwrite an +-# existing .o file with -o, though they will create one. +-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-rm -f conftest2.* +-if { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; +-then +- eval ac_cv_prog_cc_${ac_cc}_c_o=yes +- if test "x$CC" != xcc; then +- # Test first that cc exists at all. +- if { ac_try='cc -c conftest.$ac_ext >&5' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +- rm -f conftest2.* +- if { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; +- then +- # cc works too. +- : +- else +- # cc exists but doesn't like -o. +- eval ac_cv_prog_cc_${ac_cc}_c_o=no +- fi +- fi +- fi +-else +- eval ac_cv_prog_cc_${ac_cc}_c_o=no +-fi +-rm -f core conftest* +- +-fi +-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++LD="$lt_cv_path_LD" ++if test -n "$LD"; then ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +- +-cat >>confdefs.h <<\_ACEOF +-#define NO_MINUS_C_MINUS_O 1 +-_ACEOF +- +-fi +- +-# FIXME: we rely on the cache variable name because +-# there is no other way. +-set dummy $CC +-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +- # Losing compiler, so override with the script. +- # FIXME: It is wrong to rewrite CC. +- # But if we don't then we get into trouble of one sort or another. +- # A longer-term fix would be to have automake use am__CC in this case, +- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" +- CC="$am_aux_dir/compile $CC" +-fi +- +-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +-LN_S=$as_ln_s +-if test "$LN_S" = "ln -s"; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6; } + fi +- +-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } +-if test "${ac_cv_path_SED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&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" | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= +- # Extract the first word of "sed gsed" to use in msg output +-if test -z "$SED"; then +-set dummy sed gsed; ac_prog_name=$2 +-if test "${ac_cv_path_SED+set}" = set; then ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++ { (exit 1); exit 1; }; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- 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=:;; ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 </dev/null` in ++*GNU* | *'with BFD'*) ++ lt_cv_prog_gnu_ld=yes ++ ;; + *) +- ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- 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 +- ac_count=`expr $ac_count + 1` +- 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;; ++ lt_cv_prog_gnu_ld=no ++ ;; + esac +- +- +- $ac_path_SED_found && break 3 +- done +-done +- +-done +-IFS=$as_save_IFS +- +- + fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld + +-SED="$ac_cv_path_SED" +-if test -z "$SED"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-fi + ++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } ++if test "${lt_cv_ld_reload_flag+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_path_SED=$SED +-fi +- ++ lt_cv_ld_reload_flag='-r' + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +-echo "${ECHO_T}$ac_cv_path_SED" >&6; } +- SED="$ac_cv_path_SED" +- rm -f conftest.sed ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac + +-# Extract the first word of "nm", so it can be a program name with args. +-set dummy nm; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_NM+set}" = set; then ++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } ++if test "${lt_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$NM"; then +- ac_cv_prog_NM="$NM" # Let the user override the test. ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" + 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_NM="nm" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" + fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_NM" && ac_cv_prog_NM="nm-is-missing" +-fi +-fi +-NM=$ac_cv_prog_NM +-if test -n "$NM"; then +- { echo "$as_me:$LINENO: result: $NM" >&5 +-echo "${ECHO_T}$NM" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh +-all: +- @echo '@@@%%%=$(MAKE)=@@@%%%' +-_ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-case `${MAKE-make} -f conftest.make 2>/dev/null` in +- *@@@%%%=?*=@@@%%%*) +- eval ac_cv_prog_make_${ac_make}_set=yes;; +- *) +- eval ac_cv_prog_make_${ac_make}_set=no;; +-esac +-rm -f conftest.make ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi +-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- SET_MAKE= +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- SET_MAKE="MAKE=${MAKE-make}" + fi +- +- +-# Don't use libltdl stuff for WIN32 +-case $host_os in +- pw32* | mingw*) +- ;; +- *) +- { echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5 +-echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6; } +-if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then ++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++echo "${ECHO_T}$lt_cv_path_NM" >&6; } ++NM="$lt_cv_path_NM" ++ ++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } ++if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lltdl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char lt_dlinit (); +-int +-main () +-{ +-return lt_dlinit (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then +- ac_cv_lib_ltdl_lt_dlinit=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++case $host_os in ++aix[4-9]*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- ac_cv_lib_ltdl_lt_dlinit=no +-fi ++beos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5 +-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; } +-if test $ac_cv_lib_ltdl_lt_dlinit = yes; then +- test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no +-else +- if test x"$enable_ltdl_install" = xno; then +- { echo "$as_me:$LINENO: WARNING: libltdl not installed, but installation disabled" >&5 +-echo "$as_me: WARNING: libltdl not installed, but installation disabled" >&2;} +- else +- enable_ltdl_install=yes +- fi ++bsdi[45]*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so ++ ;; + +-fi ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; + +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/''libltdl'/libltdl.la +- LTDLINCL='-I${top_srcdir}/''libltdl' ++mingw* | pw32*) ++ # Base MSYS/MinGW do not provide the 'file' command needed by ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' + else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' + fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" ++ ;; ++ ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; + ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac ++ ;; + ++interix[3-9]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ++ ;; + ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- subdirs="$subdirs libltdl" ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- ;; +-esac ++netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ++ fi ++ ;; + ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; + +-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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown + ;; +- *) +- 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi +-done +-done +-IFS=$as_save_IFS ++ ;; ++ ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all + ;; + esac ++ + fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi ++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown + + +-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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&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" +- echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi + +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.9.0 +- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- PKG_CONFIG="" +- fi ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC + ++# Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then ++ enableval=$enable_libtool_lock; + 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" ++ ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '#line 5436 "configure"' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac + ;; + esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } ++if test "${lt_cv_cc_needs_belf+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- enable_shared=yes +-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 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + ++int ++main () ++{ + +-# 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 ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_cc_needs_belf=yes + else +- enable_static=yes ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_cc_needs_belf=no + fi + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ 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 + +-# Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then +- enableval=$enable_fast_install; p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=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_fast_install=yes ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" + fi +- done +- IFS="$lt_save_ifs" ++ ;; ++ esac + ;; + esac +-else +- enable_fast_install=yes +-fi +- ++ fi ++ rm -rf conftest* ++ ;; + +-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } +-if test "${lt_cv_path_SED+set}" = set; then ++*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. ++ 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 lt_ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi +- done +- done +-done +-IFS=$as_save_IFS +-lt_ac_max=0 +-lt_ac_count=0 +-# Add /usr/xpg4/bin/sed as it is typically found on Solaris +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break ++ 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" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done + done ++done ++IFS=$as_save_IFS + + fi +- +-SED=$lt_cv_path_SED +- +-{ echo "$as_me:$LINENO: result: $SED" >&5 +-echo "${ECHO_T}$SED" >&6; } +- +- +-# Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then +- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++echo "${ECHO_T}$DLLTOOL" >&6; } + else +- with_gnu_ld=no ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [\\/]* | ?:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- { echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } +-else +- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++ + fi +-if test "${lt_cv_path_LD+set}" = set; then ++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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in +- *GNU* | *'with BFD'*) +- test "$with_gnu_ld" != no && break +- ;; +- *) +- test "$with_gnu_ld" != yes && break +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + else +- lt_cv_path_LD="$LD" # 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_prog_ac_ct_DLLTOOL="dlltool" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +- +-LD="$lt_cv_path_LD" +-if test -n "$LD"; then +- { echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6; } ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 </dev/null` in +-*GNU* | *'with BFD'*) +- lt_cv_prog_gnu_ld=yes +- ;; +-*) +- lt_cv_prog_gnu_ld=no +- ;; +-esac +-fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +-with_gnu_ld=$lt_cv_prog_gnu_ld + +- +-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi + else +- lt_cv_ld_reload_flag='-r' ++ DLLTOOL="$ac_cv_prog_DLLTOOL" + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +-reload_flag=$lt_cv_ld_reload_flag +-case $reload_flag in +-"" | " "*) ;; +-*) reload_flag=" $reload_flag" ;; +-esac +-reload_cmds='$LD$reload_flag -o $output$reload_objs' +-case $host_os in +- darwin*) +- if test "$GCC" = yes; then +- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +- else +- reload_cmds='$LD$reload_flag -o $output$reload_objs' +- fi +- ;; +-esac + +-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. ++set dummy ${ac_tool_prefix}as; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_AS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" ++ if test -n "$AS"; then ++ ac_cv_prog_AS="$AS" # Let the user override the test. + else +- lt_nm_to_check="${ac_tool_prefix}nm" +- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then +- lt_nm_to_check="$lt_nm_to_check nm" ++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" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi +- for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" +- break +- ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; +- esac +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" +- done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-echo "${ECHO_T}$lt_cv_path_NM" >&6; } +-NM="$lt_cv_path_NM" +- +-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++AS=$ac_cv_prog_AS ++if test -n "$AS"; then ++ { echo "$as_me:$LINENO: result: $AS" >&5 ++echo "${ECHO_T}$AS" >&6; } + else +- lt_cv_file_magic_cmd='$MAGIC_CMD' +-lt_cv_file_magic_test_file= +-lt_cv_deplibs_check_method='unknown' +-# Need to set the preceding variable on all platforms that support +-# interlibrary dependencies. +-# 'none' -- dependencies not supported. +-# `unknown' -- same as none, but documents that we really don't know. +-# 'pass_all' -- all dependencies passed with no checks. +-# 'test_compile' -- check by making test program. +-# 'file_magic [[regex]]' -- check by looking for files in library path +-# which responds to the $file_magic_cmd with a given extended regex. +-# If you have `file' or equivalent on your system and you're not sure +-# whether `pass_all' will *always* work, you probably want this one. +- +-case $host_os in +-aix[4-9]*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-beos*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-bsdi[45]*) +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' +- lt_cv_file_magic_cmd='/usr/bin/file -L' +- lt_cv_file_magic_test_file=/shlib/libc.so +- ;; ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + +-cygwin*) +- # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- ;; + +-mingw* | pw32*) +- # Base MSYS/MinGW do not provide the 'file' command needed by +- # func_win32_libid shell function, so use a weaker test based on 'objdump', +- # unless we find 'file', for example because we are cross-compiling. +- if ( file / ) >/dev/null 2>&1; then +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' ++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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&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" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi +- ;; ++done ++done ++IFS=$as_save_IFS + +-darwin* | rhapsody*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++fi ++fi ++ac_ct_AS=$ac_cv_prog_ac_ct_AS ++if test -n "$ac_ct_AS"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++echo "${ECHO_T}$ac_ct_AS" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + +-freebsd* | dragonfly*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- ;; +- esac ++ if test "x$ac_ct_AS" = x; then ++ AS="false" + else +- lt_cv_deplibs_check_method=pass_all ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ AS=$ac_ct_AS + fi +- ;; +- +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- case $host_cpu in +- ia64*) +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' +- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +- ;; +- hppa*64*) +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl +- ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl +- ;; +- esac +- ;; ++else ++ AS="$ac_cv_prog_AS" ++fi + +-interix[3-9]*) +- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' +- ;; ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&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" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++echo "${ECHO_T}$OBJDUMP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- lt_cv_deplibs_check_method=pass_all +- ;; + +-netbsd* | netbsdelf*-gnu) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +- else +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ++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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&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" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi +- ;; +- +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; ++done ++done ++IFS=$as_save_IFS + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown +- ;; ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" + else +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP + fi +- ;; ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi + +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all + ;; + +-rdos*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++esac + +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++need_locks="$enable_libtool_lock" + +-sysv4 | sysv4.3*) +- case $host_vendor in +- motorola) +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` +- ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all +- ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' +- ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so +- ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all +- ;; +- pc) +- lt_cv_deplibs_check_method=pass_all +- ;; +- esac +- ;; + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++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 ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++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 >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; + esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ # Broken: fails on valid input. ++continue + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown +- +- + ++rm -f conftest.err conftest.$ac_ext + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi + +-# Allow CC to be a program name with arguments. +-compiler=$CC ++rm -f conftest.err conftest.$ac_ext + +-# Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then +- enableval=$enable_libtool_lock; ++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 + +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ done ++ ac_cv_prog_CPP=$CPP + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '#line 6925 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$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 >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|sparc*-*linux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ # 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 >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.o` in +- *32-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_i386_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_x86_64_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi + +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++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 +- ac_ext=c ++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++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 + +- cat >conftest.$ac_ext <<_ACEOF ++ ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> + + int + main () +@@ -7040,14 +6168,14 @@ main () + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -7056,350 +6184,207 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then +- lt_cv_cc_needs_belf=yes ++ } && test -s conftest.$ac_objext; then ++ ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- lt_cv_cc_needs_belf=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- 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 +- +-fi +-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- 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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&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" +- echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +-echo "${ECHO_T}$DLLTOOL" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&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" +- echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- if test "x$ac_ct_DLLTOOL" = x; then +- DLLTOOL="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-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}as", so it can be a program name with args. +-set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&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" +- echo "$as_me:$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 +- { echo "$as_me:$LINENO: result: $AS" >&5 +-echo "${ECHO_T}$AS" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ ac_cv_header_stdc=no + fi + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* 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 +-ac_ct_AS=$ac_cv_prog_ac_ct_AS +-if test -n "$ac_ct_AS"; then +- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +-echo "${ECHO_T}$ac_ct_AS" >&6; } ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ ac_cv_header_stdc=no + fi ++rm -f conftest* + +- if test "x$ac_ct_AS" = x; then +- AS="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-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}objdump", so it can be a program name with args. +-set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++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 +- if test -n "$OBJDUMP"; then +- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* 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 ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : + 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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++( exit $ac_status ) ++ac_cv_header_stdc=no + fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +-OBJDUMP=$ac_cv_prog_OBJDUMP +-if test -n "$OBJDUMP"; then +- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +-echo "${ECHO_T}$OBJDUMP" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ ++ + fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then + ++cat >>confdefs.h <<\_ACEOF ++#define STDC_HEADERS 1 ++_ACEOF + + fi +-if test -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 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&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" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + +-fi +-fi +-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +-if test -n "$ac_ct_OBJDUMP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ eval "$as_ac_Header=yes" + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_Header=no" + fi + +- if test "x$ac_ct_OBJDUMP" = x; then +- OBJDUMP="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- OBJDUMP=$ac_ct_OBJDUMP +- fi +-else +- OBJDUMP="$ac_cv_prog_OBJDUMP" ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + +- ;; +- +-esac ++fi + +-need_locks="$enable_libtool_lock" ++done + + + +@@ -7978,6 +6963,7 @@ else + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -8007,9 +6993,7 @@ fi + echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -9796,11 +8780,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9799: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8783: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9803: \$? = $ac_status" >&5 ++ echo "$as_me:8787: \$? = $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. +@@ -10086,11 +9070,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10089: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9073: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10093: \$? = $ac_status" >&5 ++ echo "$as_me:9077: \$? = $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. +@@ -10190,11 +9174,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10193: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9177: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10197: \$? = $ac_status" >&5 ++ echo "$as_me:9181: \$? = $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 +@@ -12567,7 +11551,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 12570 "configure" ++#line 11554 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12667,7 +11651,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 12670 "configure" ++#line 11654 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15068,11 +14052,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15071: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14055: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15075: \$? = $ac_status" >&5 ++ echo "$as_me:14059: \$? = $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. +@@ -15172,11 +14156,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15175: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14159: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15179: \$? = $ac_status" >&5 ++ echo "$as_me:14163: \$? = $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 +@@ -16770,11 +15754,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16773: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15757: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16777: \$? = $ac_status" >&5 ++ echo "$as_me:15761: \$? = $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. +@@ -16874,11 +15858,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16877: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15861: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16881: \$? = $ac_status" >&5 ++ echo "$as_me:15865: \$? = $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 +@@ -19094,11 +18078,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19097: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18081: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19101: \$? = $ac_status" >&5 ++ echo "$as_me:18085: \$? = $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. +@@ -19384,11 +18368,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19387: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18371: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19391: \$? = $ac_status" >&5 ++ echo "$as_me:18375: \$? = $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. +@@ -19488,11 +18472,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19491: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18475: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:19495: \$? = $ac_status" >&5 ++ echo "$as_me:18479: \$? = $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 +@@ -22224,7 +21208,7 @@ fi + + + # Check if have style-sheet too +-if test "x$default_docbook" != "xno"; then ++if test "x$default_docbook" != "xno" && test "x$cross_compiling" = "xno"; then + as_ac_File=`echo "ac_cv_file_$default_docbook/manpages/docbook.xsl" | $as_tr_sh` + { echo "$as_me:$LINENO: checking for $default_docbook/manpages/docbook.xsl" >&5 + echo $ECHO_N "checking for $default_docbook/manpages/docbook.xsl... $ECHO_C" >&6; } +@@ -22282,9 +21266,7 @@ else + fi + + +- +- +-if test x$xsltproc != xno -a x$dbroot != xno; then ++ if test x$xsltproc != xno -a x$dbroot != xno; then + HAVE_XSL_TRUE= + HAVE_XSL_FALSE='#' + else +@@ -22335,9 +21317,7 @@ echo "${ECHO_T}no" >&6; } + fi + + +- +- +-if test x$man2html != xno; then ++ if test x$man2html != xno; then + HAVE_MAN2HTML_TRUE= + HAVE_MAN2HTML_FALSE='#' + else +@@ -22388,9 +21368,7 @@ echo "${ECHO_T}no" >&6; } + fi + + +- +- +-if test x$doxygen != xno; then ++ if test x$doxygen != xno; then + HAVE_DOXYGEN_TRUE= + HAVE_DOXYGEN_FALSE='#' + else +@@ -24516,357 +23494,23 @@ int main () + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) +- return 1; +- } +- } +-#endif +- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is +- provided. */ +- if (/* Try standardized names. */ +- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) +- /* Try IRIX, OSF/1 names. */ +- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) +- /* Try AIX names. */ +- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) +- /* Try HP-UX names. */ +- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) +- return 1; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- am_cv_func_iconv_works=yes +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-am_cv_func_iconv_works=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- LIBS="$am_save_LIBS" +- +-fi +-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5 +-echo "${ECHO_T}$am_cv_func_iconv_works" >&6; } +- case "$am_cv_func_iconv_works" in +- *no) am_func_iconv=no am_cv_lib_iconv=no ;; +- *) am_func_iconv=yes ;; +- esac +- else +- am_func_iconv=no am_cv_lib_iconv=no +- fi +- if test "$am_func_iconv" = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_ICONV 1 +-_ACEOF +- +- fi +- if test "$am_cv_lib_iconv" = yes; then +- { echo "$as_me:$LINENO: checking how to link with libiconv" >&5 +-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $LIBICONV" >&5 +-echo "${ECHO_T}$LIBICONV" >&6; } +- else +- CPPFLAGS="$am_save_CPPFLAGS" +- LIBICONV= +- LTLIBICONV= +- fi +- +- +- +- if test "$am_cv_func_iconv" = yes; then +- { echo "$as_me:$LINENO: checking for iconv declaration" >&5 +-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; } +- if test "${am_cv_proto_iconv+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <stdlib.h> +-#include <iconv.h> +-extern +-#ifdef __cplusplus +-"C" +-#endif +-#if defined(__STDC__) || defined(__cplusplus) +-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +-#else +-size_t iconv(); +-#endif +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- am_cv_proto_iconv_arg1="" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- am_cv_proto_iconv_arg1="const" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" +-fi +- +- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` +- { echo "$as_me:$LINENO: result: ${ac_t:- +- }$am_cv_proto_iconv" >&5 +-echo "${ECHO_T}${ac_t:- +- }$am_cv_proto_iconv" >&6; } +- +-cat >>confdefs.h <<_ACEOF +-#define ICONV_CONST $am_cv_proto_iconv_arg1 +-_ACEOF +- +- fi +- +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +-privatelibs="" +- +-# Check for libxml (Allow compilation of libelektratools) +- +- +-# Check whether --with-xml-prefix was given. +-if test "${with_xml_prefix+set}" = set; then +- withval=$with_xml_prefix; xml_config_prefix="$withval" +-else +- xml_config_prefix="" +-fi +- +- +-# Check whether --with-xml-exec-prefix was given. +-if test "${with_xml_exec_prefix+set}" = set; then +- withval=$with_xml_exec_prefix; xml_config_exec_prefix="$withval" +-else +- xml_config_exec_prefix="" +-fi +- +-# Check whether --enable-xmltest was given. +-if test "${enable_xmltest+set}" = set; then +- enableval=$enable_xmltest; +-else +- enable_xmltest=yes +-fi +- +- +- if test x$xml_config_exec_prefix != x ; then +- xml_config_args="$xml_config_args" +- if test x${XML2_CONFIG+set} != xset ; then +- XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config +- fi +- fi +- if test x$xml_config_prefix != x ; then +- xml_config_args="$xml_config_args --prefix=$xml_config_prefix" +- if test x${XML2_CONFIG+set} != xset ; then +- XML2_CONFIG=$xml_config_prefix/bin/xml2-config +- fi +- fi +- +- # Extract the first word of "xml2-config", so it can be a program name with args. +-set dummy xml2-config; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_XML2_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $XML2_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_XML2_CONFIG="$XML2_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_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_XML2_CONFIG" && ac_cv_path_XML2_CONFIG="no" +- ;; +-esac +-fi +-XML2_CONFIG=$ac_cv_path_XML2_CONFIG +-if test -n "$XML2_CONFIG"; then +- { echo "$as_me:$LINENO: result: $XML2_CONFIG" >&5 +-echo "${ECHO_T}$XML2_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- min_xml_version=2.0.0 +- { echo "$as_me:$LINENO: checking for libxml - version >= $min_xml_version" >&5 +-echo $ECHO_N "checking for libxml - version >= $min_xml_version... $ECHO_C" >&6; } +- no_xml="" +- if test "$XML2_CONFIG" = "no" ; then +- no_xml=yes +- else +- XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags` +- XML_LIBS=`$XML2_CONFIG $xml_config_args --libs` +- xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +- xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` +- xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` +- if test "x$enable_xmltest" = "xyes" ; then +- ac_save_CPPFLAGS="$CPPFLAGS" +- ac_save_LIBS="$LIBS" +- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" +- LIBS="$XML_LIBS $LIBS" +- rm -f conf.xmltest +- if test "$cross_compiling" = yes; then +- echo $ac_n "cross compiling; assumed OK... $ac_c" +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <stdlib.h> +-#include <stdio.h> +-#include <string.h> +-#include <libxml/xmlversion.h> +- +-int +-main() +-{ +- int xml_major_version, xml_minor_version, xml_micro_version; +- int major, minor, micro; +- char *tmp_version; +- +- system("touch conf.xmltest"); +- +- /* Capture xml2-config output via autoconf/configure variables */ +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = (char *)strdup("$min_xml_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string from xml2-config\n", "$min_xml_version"); +- exit(1); +- } +- free(tmp_version); +- +- /* Capture the version information from the header files */ +- tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION); +- if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { +- printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION"); +- exit(1); +- } +- free(tmp_version); +- +- /* Compare xml2-config output to the libxml headers */ +- if ((xml_major_version != $xml_config_major_version) || +- (xml_minor_version != $xml_config_minor_version) || +- (xml_micro_version != $xml_config_micro_version)) +- { +- printf("*** libxml header files (version %d.%d.%d) do not match\n", +- xml_major_version, xml_minor_version, xml_micro_version); +- printf("*** xml2-config (version %d.%d.%d)\n", +- $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); +- return 1; +- } +-/* Compare the headers to the library to make sure we match */ +- /* Less than ideal -- doesn't provide us with return value feedback, +- * only exits if there's a serious mismatch between header and library. +- */ +- LIBXML_TEST_VERSION; +- +- /* Test that the library is greater than our minimum version */ +- if ((xml_major_version > major) || +- ((xml_major_version == major) && (xml_minor_version > minor)) || +- ((xml_major_version == major) && (xml_minor_version == minor) && +- (xml_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", +- xml_major_version, xml_minor_version, xml_micro_version); +- printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** libxml is always available from ftp://ftp.xmlsoft.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 xml2-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); +- printf("*** correct copy of xml2-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; ++ return 1; ++ } ++ } ++#endif ++ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is ++ provided. */ ++ if (/* Try standardized names. */ ++ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) ++ /* Try IRIX, OSF/1 names. */ ++ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) ++ /* Try AIX names. */ ++ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) ++ /* Try HP-UX names. */ ++ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) ++ return 1; ++ return 0; + } +- + _ACEOF + rm -f conftest$ac_exeext + if { (ac_try="$ac_link" +@@ -24888,69 +23532,93 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- : ++ am_cv_func_iconv_works=yes + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +-no_xml=yes ++am_cv_func_iconv_works=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" +- fi ++ LIBS="$am_save_LIBS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5 ++echo "${ECHO_T}$am_cv_func_iconv_works" >&6; } ++ case "$am_cv_func_iconv_works" in ++ *no) am_func_iconv=no am_cv_lib_iconv=no ;; ++ *) am_func_iconv=yes ;; ++ esac ++ else ++ am_func_iconv=no am_cv_lib_iconv=no + fi ++ if test "$am_func_iconv" = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_ICONV 1 ++_ACEOF + +- if test "x$no_xml" = x ; then +- { echo "$as_me:$LINENO: result: yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&5 +-echo "${ECHO_T}yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&6; } +- elektra_have_xml="yes" ++ fi ++ if test "$am_cv_lib_iconv" = yes; then ++ { echo "$as_me:$LINENO: checking how to link with libiconv" >&5 ++echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $LIBICONV" >&5 ++echo "${ECHO_T}$LIBICONV" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- if test "$XML2_CONFIG" = "no" ; then +- echo "*** The xml2-config script installed by LIBXML could not be found" +- echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the XML2_CONFIG environment variable to the" +- echo "*** full path to xml2-config." +- else +- if test -f conf.xmltest ; then +- : +- else +- echo "*** Could not run libxml test program, checking why..." +- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" +- LIBS="$LIBS $XML_LIBS" +- cat >conftest.$ac_ext <<_ACEOF ++ CPPFLAGS="$am_save_CPPFLAGS" ++ LIBICONV= ++ LTLIBICONV= ++ fi ++ ++ ++ ++ if test "$am_cv_func_iconv" = yes; then ++ { echo "$as_me:$LINENO: checking for iconv declaration" >&5 ++echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; } ++ if test "${am_cv_proto_iconv+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-#include <libxml/xmlversion.h> +-#include <stdio.h> ++#include <stdlib.h> ++#include <iconv.h> ++extern ++#ifdef __cplusplus ++"C" ++#endif ++#if defined(__STDC__) || defined(__cplusplus) ++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ++#else ++size_t iconv(); ++#endif + + int + main () + { +- LIBXML_TEST_VERSION; return 0; ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -24959,45 +23627,117 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then +- echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding LIBXML or finding the wrong" +- echo "*** version of LIBXML. If it is not finding LIBXML, 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" ++ } && test -s conftest.$ac_objext; then ++ am_cv_proto_iconv_arg1="" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means LIBXML was incorrectly installed" +- echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" +- echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ++ am_cv_proto_iconv_arg1="const" + fi + +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" ++fi ++ ++ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` ++ { echo "$as_me:$LINENO: result: ${ac_t:- ++ }$am_cv_proto_iconv" >&5 ++echo "${ECHO_T}${ac_t:- ++ }$am_cv_proto_iconv" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++#define ICONV_CONST $am_cv_proto_iconv_arg1 ++_ACEOF + +- XML_CPPFLAGS="" +- XML_LIBS="" +- elektra_have_xml="no" + fi + ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++privatelibs="" ++ ++# Check for libxml (Allow compilation of libelektratools) ++REQUIRES_LIBXML2="libxml2 >= 2.6.0" ++ ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for libxml2" >&5 ++echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$libxml2_CFLAGS"; then ++ pkg_cv_libxml2_CFLAGS="$libxml2_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${REQUIRES_LIBXML2}\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "${REQUIRES_LIBXML2}") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_libxml2_CFLAGS=`$PKG_CONFIG --cflags "${REQUIRES_LIBXML2}" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$libxml2_LIBS"; then ++ pkg_cv_libxml2_LIBS="$libxml2_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${REQUIRES_LIBXML2}\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "${REQUIRES_LIBXML2}") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_libxml2_LIBS=`$PKG_CONFIG --libs "${REQUIRES_LIBXML2}" 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 ++ libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${REQUIRES_LIBXML2}"` ++ else ++ libxml2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${REQUIRES_LIBXML2}"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$libxml2_PKG_ERRORS" >&5 ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ HAVE_XML=no + +- rm -f conf.xmltest ++elif test $pkg_failed = untried; then ++ HAVE_XML=no + ++else ++ libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS ++ libxml2_LIBS=$pkg_cv_libxml2_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ HAVE_XML=yes ++fi + + +-if test x$elektra_have_xml = xyes; then ++ if test "$HAVE_XML" = "yes"; then + HAVE_XML_TRUE= + HAVE_XML_FALSE='#' + else +@@ -25005,9 +23745,10 @@ else + HAVE_XML_FALSE= + fi + +-if test "x$elektra_have_xml" = "xyes"; then ++ ++if test $HAVE_XML; then + elektratools=libelektratools +- privatelibs=$privatelibs" -lxml2" ++ privatelibs=$privatelibs"$libxml2_LIBS" + fi + + +@@ -25018,7 +23759,6 @@ fi + + + +- + # + # Backends enable and disable logic. + # +@@ -26006,10 +24746,12 @@ fi + + + +-backend_static_libs= +-for backend in $BACKENDS; do +- backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a" +-done ++if test x$enable_static = xyes; then ++ backend_static_libs= ++ for backend in $BACKENDS; do ++ backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a" ++ done ++fi + + + +@@ -28606,17 +27348,10 @@ LIBOBJS=$ac_libobjs + LTLIBOBJS=$ac_ltlibobjs + + +-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++echo "$as_me: error: conditional \"ENABLE_STATIC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -28641,6 +27376,13 @@ echo "$as_me: error: conditional \"VALGR + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -29047,6 +27789,7 @@ gives unlimited permission to copy, dist + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -29309,6 +28052,7 @@ INSTALL!$INSTALL$ac_delim + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -29327,25 +28071,24 @@ am__leading_dot!$am__leading_dot$ac_deli + AMTAR!$AMTAR$ac_delim + am__tar!$am__tar$ac_delim + am__untar!$am__untar$ac_delim +-CC!$CC$ac_delim +-CFLAGS!$CFLAGS$ac_delim +-LDFLAGS!$LDFLAGS$ac_delim +-CPPFLAGS!$CPPFLAGS$ac_delim +-ac_ct_CC!$ac_ct_CC$ac_delim +-EXEEXT!$EXEEXT$ac_delim +-OBJEXT!$OBJEXT$ac_delim +-DEPDIR!$DEPDIR$ac_delim +-am__include!$am__include$ac_delim +-am__quote!$am__quote$ac_delim +-AMDEP_TRUE!$AMDEP_TRUE$ac_delim +-AMDEP_FALSE!$AMDEP_FALSE$ac_delim +-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +-CCDEPMODE!$CCDEPMODE$ac_delim +-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +-CPP!$CPP$ac_delim +-GREP!$GREP$ac_delim +-EGREP!$EGREP$ac_delim ++ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim ++ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim ++DEBUG_TRUE!$DEBUG_TRUE$ac_delim ++DEBUG_FALSE!$DEBUG_FALSE$ac_delim ++EXPERIMENTAL_TRUE!$EXPERIMENTAL_TRUE$ac_delim ++EXPERIMENTAL_FALSE!$EXPERIMENTAL_FALSE$ac_delim ++VALGRIND!$VALGRIND$ac_delim ++VALGRINDTESTS_TRUE!$VALGRINDTESTS_TRUE$ac_delim ++VALGRINDTESTS_FALSE!$VALGRINDTESTS_FALSE$ac_delim ++LCOV!$LCOV$ac_delim ++GENHTML!$GENHTML$ac_delim ++CSTDFLAGS!$CSTDFLAGS$ac_delim ++COPTFLAGS!$COPTFLAGS$ac_delim ++CDBGFLAGS!$CDBGFLAGS$ac_delim ++CXXSTDFLAGS!$CXXSTDFLAGS$ac_delim ++CXXOPTFLAGS!$CXXOPTFLAGS$ac_delim ++CXXDBGFLAGS!$CXXDBGFLAGS$ac_delim ++ulibdir!$ulibdir$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -29387,28 +28130,28 @@ _ACEOF + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-DEBUG_TRUE!$DEBUG_TRUE$ac_delim +-DEBUG_FALSE!$DEBUG_FALSE$ac_delim +-EXPERIMENTAL_TRUE!$EXPERIMENTAL_TRUE$ac_delim +-EXPERIMENTAL_FALSE!$EXPERIMENTAL_FALSE$ac_delim +-VALGRIND!$VALGRIND$ac_delim +-VALGRINDTESTS_TRUE!$VALGRINDTESTS_TRUE$ac_delim +-VALGRINDTESTS_FALSE!$VALGRINDTESTS_FALSE$ac_delim +-LCOV!$LCOV$ac_delim +-GENHTML!$GENHTML$ac_delim +-CSTDFLAGS!$CSTDFLAGS$ac_delim +-COPTFLAGS!$COPTFLAGS$ac_delim +-CDBGFLAGS!$CDBGFLAGS$ac_delim +-CXXSTDFLAGS!$CXXSTDFLAGS$ac_delim +-CXXOPTFLAGS!$CXXOPTFLAGS$ac_delim +-CXXDBGFLAGS!$CXXDBGFLAGS$ac_delim +-ulibdir!$ulibdir$ac_delim + backenddir!$backenddir$ac_delim + hlvlbackenddir!$hlvlbackenddir$ac_delim + develdocdir!$develdocdir$ac_delim + default_docbook!$default_docbook$ac_delim + default_backend!$default_backend$ac_delim + default_dbackend!$default_dbackend$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim + LN_S!$LN_S$ac_delim + SED!$SED$ac_delim + NM!$NM$ac_delim +@@ -29416,6 +28159,8 @@ LTDLINCL!$LTDLINCL$ac_delim + LIBLTDL!$LIBLTDL$ac_delim + subdirs!$subdirs$ac_delim + PKG_CONFIG!$PKG_CONFIG$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim + RANLIB!$RANLIB$ac_delim +@@ -29424,6 +28169,7 @@ NMEDIT!$NMEDIT$ac_delim + DLLTOOL!$DLLTOOL$ac_delim + AS!$AS$ac_delim + OBJDUMP!$OBJDUMP$ac_delim ++CPP!$CPP$ac_delim + CXX!$CXX$ac_delim + CXXFLAGS!$CXXFLAGS$ac_delim + ac_ct_CXX!$ac_ct_CXX$ac_delim +@@ -29447,12 +28193,11 @@ HAVE_DOXYGEN_TRUE!$HAVE_DOXYGEN_TRUE$ac_ + HAVE_DOXYGEN_FALSE!$HAVE_DOXYGEN_FALSE$ac_delim + LIBICONV!$LIBICONV$ac_delim + LTLIBICONV!$LTLIBICONV$ac_delim +-XML2_CONFIG!$XML2_CONFIG$ac_delim +-XML_CPPFLAGS!$XML_CPPFLAGS$ac_delim +-XML_LIBS!$XML_LIBS$ac_delim ++REQUIRES_LIBXML2!$REQUIRES_LIBXML2$ac_delim ++libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim ++libxml2_LIBS!$libxml2_LIBS$ac_delim + HAVE_XML_TRUE!$HAVE_XML_TRUE$ac_delim + HAVE_XML_FALSE!$HAVE_XML_FALSE$ac_delim +-elektratools!$elektratools$ac_delim + gconf_CFLAGS!$gconf_CFLAGS$ac_delim + gconf_LIBS!$gconf_LIBS$ac_delim + BACKENDS!$BACKENDS$ac_delim +@@ -29464,7 +28209,7 @@ LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -29691,6 +28436,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -29744,6 +28494,7 @@ s&@builddir@&$ac_builddir&;t t + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +@@ -29859,21 +28610,22 @@ echo "$as_me: $ac_file is unchanged" >&6 + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -29908,8 +28660,9 @@ echo "$as_me: executing $ac_file command + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +Index: elektra-0.7.0rc5/doc/images/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/doc/images/Makefile.in ++++ elektra-0.7.0rc5/doc/images/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + # $Id$ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,8 +37,7 @@ target_triplet = @target@ + subdir = doc/images + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -50,10 +46,7 @@ CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -79,8 +72,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -91,20 +82,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -126,6 +108,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -141,25 +124,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -173,6 +152,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -183,7 +163,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -199,6 +178,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -212,6 +193,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -219,6 +201,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + EXTRA_DIST = classes.png img_arrow.png important.gif link_button_1.gif note.gif type-binary.png type-extendedbinary.png type-extendedstring.png type-folder.png type-link.png type-string.png +@@ -260,10 +244,6 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -272,22 +252,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -332,7 +311,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -346,12 +325,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -370,17 +357,20 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ 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-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/doc/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/doc/Makefile.in ++++ elektra-0.7.0rc5/doc/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,13 +16,10 @@ + + # $Id$ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -41,8 +38,7 @@ target_triplet = @target@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -52,10 +48,11 @@ SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + man1dir = $(mandir)/man1 + am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \ + "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \ +@@ -73,14 +70,13 @@ am__vpath_adj = case $$p in \ + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + develdocDATA_INSTALL = $(INSTALL_DATA) + DATA = $(develdoc_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -106,8 +102,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -118,20 +112,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -153,6 +138,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -168,25 +154,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -200,6 +182,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -210,7 +193,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -226,6 +208,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -239,6 +223,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -246,6 +231,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + #EXTRA_DIST+=elektra.odp +@@ -343,13 +330,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -394,7 +377,7 @@ uninstall-man1: + done + install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" ++ test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -439,7 +422,7 @@ uninstall-man5: + done + install-man7: $(man7_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man7dir)" || $(mkdir_p) "$(DESTDIR)$(man7dir)" ++ test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)" + @list='$(man7_MANS) $(dist_man7_MANS) $(nodist_man7_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -514,8 +497,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -559,8 +541,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -585,8 +567,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -596,13 +578,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -616,22 +597,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -645,7 +625,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -653,6 +633,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -666,7 +648,7 @@ all-am: Makefile $(MANS) $(DATA) + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(develdocdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -700,8 +682,7 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -715,12 +696,20 @@ info-am: + + install-data-am: install-develdocDATA install-man + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: install-man1 install-man3 install-man5 install-man7 + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -739,28 +728,30 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-develdocDATA uninstall-info-am uninstall-man +- +-uninstall-info: uninstall-info-recursive ++uninstall-am: uninstall-develdocDATA uninstall-man + + uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \ + uninstall-man7 + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-local clean-recursive \ +- ctags ctags-recursive dist-hook distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-develdocDATA install-exec \ +- install-exec-am install-info install-info-am install-man \ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ clean-local ctags ctags-recursive dist-hook distclean \ ++ 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-develdocDATA install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ + install-man1 install-man3 install-man5 install-man7 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am \ +- uninstall-develdocDATA uninstall-info-am uninstall-man \ +- uninstall-man1 uninstall-man3 uninstall-man5 uninstall-man7 ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-develdocDATA uninstall-man uninstall-man1 \ ++ uninstall-man3 uninstall-man5 uninstall-man7 + + + @HAVE_XSL_TRUE@SUFFIXES: .xml .html .pdf .ps .rtf .xsl .fo .tpl +Index: elektra-0.7.0rc5/doc/standards/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/doc/standards/Makefile.in ++++ elektra-0.7.0rc5/doc/standards/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + # $Id$ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,8 +37,7 @@ target_triplet = @target@ + subdir = doc/standards + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -50,10 +46,7 @@ CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -79,8 +72,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -91,20 +82,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -126,6 +108,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -141,25 +124,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -173,6 +152,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -183,7 +163,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -199,6 +178,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -212,6 +193,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -219,6 +201,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + EXTRA_DIST = env.xml filesystems.xml network.xml signature.xml userdb.xml sysinit.xml +@@ -260,10 +244,6 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -272,22 +252,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -332,7 +311,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -346,12 +325,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -370,17 +357,20 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ 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-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/examples/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/examples/Makefile.in ++++ elektra-0.7.0rc5/examples/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + # $Id$ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,8 +41,7 @@ check_PROGRAMS = small$(EXEEXT) test$(EX + subdir = examples + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -87,17 +83,18 @@ small_DEPENDENCIES = ../src/libelektra/l + am_test_OBJECTS = test.$(OBJEXT) + test_OBJECTS = $(am_test_OBJECTS) + test_DEPENDENCIES = ../src/libelektra/libelektra.la +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(application_SOURCES) $(binary_SOURCES) \ + $(cascading_SOURCES) $(example_SOURCES) $(functional_SOURCES) \ + $(hello_SOURCES) $(hellokdb_SOURCES) $(keyNewExample_SOURCES) \ +@@ -111,10 +108,7 @@ DIST_SOURCES = $(application_SOURCES) $( + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -140,8 +134,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -152,20 +144,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -187,6 +170,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -202,25 +186,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -234,6 +214,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -244,7 +225,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -260,6 +240,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -273,6 +255,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -280,6 +263,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CFLAGS = $(CSTDFLAGS) $(COPTFLAGS) $(CDBGFLAGS) +@@ -352,40 +337,40 @@ clean-checkPROGRAMS: + done + application$(EXEEXT): $(application_OBJECTS) $(application_DEPENDENCIES) + @rm -f application$(EXEEXT) +- $(LINK) $(application_LDFLAGS) $(application_OBJECTS) $(application_LDADD) $(LIBS) ++ $(LINK) $(application_OBJECTS) $(application_LDADD) $(LIBS) + binary$(EXEEXT): $(binary_OBJECTS) $(binary_DEPENDENCIES) + @rm -f binary$(EXEEXT) +- $(LINK) $(binary_LDFLAGS) $(binary_OBJECTS) $(binary_LDADD) $(LIBS) ++ $(LINK) $(binary_OBJECTS) $(binary_LDADD) $(LIBS) + cascading$(EXEEXT): $(cascading_OBJECTS) $(cascading_DEPENDENCIES) + @rm -f cascading$(EXEEXT) +- $(LINK) $(cascading_LDFLAGS) $(cascading_OBJECTS) $(cascading_LDADD) $(LIBS) ++ $(LINK) $(cascading_OBJECTS) $(cascading_LDADD) $(LIBS) + example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) + @rm -f example$(EXEEXT) +- $(LINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS) ++ $(LINK) $(example_OBJECTS) $(example_LDADD) $(LIBS) + functional$(EXEEXT): $(functional_OBJECTS) $(functional_DEPENDENCIES) + @rm -f functional$(EXEEXT) +- $(LINK) $(functional_LDFLAGS) $(functional_OBJECTS) $(functional_LDADD) $(LIBS) ++ $(LINK) $(functional_OBJECTS) $(functional_LDADD) $(LIBS) + hello$(EXEEXT): $(hello_OBJECTS) $(hello_DEPENDENCIES) + @rm -f hello$(EXEEXT) +- $(LINK) $(hello_LDFLAGS) $(hello_OBJECTS) $(hello_LDADD) $(LIBS) ++ $(LINK) $(hello_OBJECTS) $(hello_LDADD) $(LIBS) + hellokdb$(EXEEXT): $(hellokdb_OBJECTS) $(hellokdb_DEPENDENCIES) + @rm -f hellokdb$(EXEEXT) +- $(LINK) $(hellokdb_LDFLAGS) $(hellokdb_OBJECTS) $(hellokdb_LDADD) $(LIBS) ++ $(LINK) $(hellokdb_OBJECTS) $(hellokdb_LDADD) $(LIBS) + keyNewExample$(EXEEXT): $(keyNewExample_OBJECTS) $(keyNewExample_DEPENDENCIES) + @rm -f keyNewExample$(EXEEXT) +- $(LINK) $(keyNewExample_LDFLAGS) $(keyNewExample_OBJECTS) $(keyNewExample_LDADD) $(LIBS) ++ $(LINK) $(keyNewExample_OBJECTS) $(keyNewExample_LDADD) $(LIBS) + keyset$(EXEEXT): $(keyset_OBJECTS) $(keyset_DEPENDENCIES) + @rm -f keyset$(EXEEXT) +- $(LINK) $(keyset_LDFLAGS) $(keyset_OBJECTS) $(keyset_LDADD) $(LIBS) ++ $(LINK) $(keyset_OBJECTS) $(keyset_LDADD) $(LIBS) + lookup$(EXEEXT): $(lookup_OBJECTS) $(lookup_DEPENDENCIES) + @rm -f lookup$(EXEEXT) +- $(LINK) $(lookup_LDFLAGS) $(lookup_OBJECTS) $(lookup_LDADD) $(LIBS) ++ $(LINK) $(lookup_OBJECTS) $(lookup_LDADD) $(LIBS) + small$(EXEEXT): $(small_OBJECTS) $(small_DEPENDENCIES) + @rm -f small$(EXEEXT) +- $(LINK) $(small_LDFLAGS) $(small_OBJECTS) $(small_LDADD) $(LIBS) ++ $(LINK) $(small_OBJECTS) $(small_LDADD) $(LIBS) + test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) + @rm -f test$(EXEEXT) +- $(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) ++ $(LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -407,22 +392,22 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -433,17 +418,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -455,8 +436,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -466,13 +447,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -486,22 +466,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -550,7 +529,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -564,12 +543,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -590,19 +577,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-checkPROGRAMS 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-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-info-am ++ tags uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/Makefile.in ++++ elektra-0.7.0rc5/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,13 +14,10 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -36,20 +33,19 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/elektra.pc.in \ + $(srcdir)/elektra.spec.in $(srcdir)/elektracpp.pc.in \ + $(srcdir)/elektratools.pc.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS TODO compile config.guess \ +- config.sub depcomp install-sh ltmain.sh missing +-subdir = . ++ config.rpath config.sub depcomp install-sh ltmain.sh missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno ++ configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/src/include/config.h + CONFIG_CLEAN_FILES = elektra.spec elektra.pc elektratools.pc \ +@@ -58,10 +54,11 @@ SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -71,6 +68,8 @@ am__strip_dir = `echo $$p | sed -e 's|^. + am__installdirs = "$(DESTDIR)$(pkgconfigdir)" + pkgconfigDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgconfig_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -85,10 +84,7 @@ DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -114,8 +110,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -126,20 +120,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -161,6 +146,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -176,25 +162,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -208,6 +190,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -218,7 +201,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -234,6 +216,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -247,6 +231,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -254,6 +239,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + ACLOCAL_AMFLAGS = -I m4 +@@ -315,10 +302,9 @@ clean-libtool: + + distclean-libtool: + -rm -f libtool +-uninstall-info-am: + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -365,8 +351,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -410,8 +395,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -436,8 +421,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -447,13 +432,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -468,24 +452,22 @@ distclean-tags: + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/src/libelektra +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -499,7 +481,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -507,6 +489,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -514,7 +498,7 @@ distdir: $(DISTFILES) + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +@@ -524,6 +508,10 @@ dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -550,6 +538,8 @@ distcheck: dist + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -589,7 +579,7 @@ distcheck: dist + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -614,7 +604,7 @@ all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -662,12 +652,20 @@ info-am: + + install-data-am: install-pkgconfigDATA + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -688,24 +686,26 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA ++uninstall-am: uninstall-pkgconfigDATA + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ +- dist-shar dist-tarZ dist-zip distcheck distclean \ +- distclean-generic distclean-libtool distclean-recursive \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-pkgconfigDATA \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ ++ distclean distclean-generic distclean-libtool distclean-tags \ ++ distcleancheck distdir distuninstallcheck 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-pkgconfigDATA install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ + uninstall-pkgconfigDATA + + +Index: elektra-0.7.0rc5/scripts/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/scripts/Makefile.in ++++ elektra-0.7.0rc5/scripts/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,13 +17,10 @@ + # $Id$ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,8 +41,7 @@ DIST_COMMON = $(dist_elekscript_DATA) $( + $(dist_elektrainit_SCRIPTS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -67,10 +63,7 @@ am__strip_dir = `echo $$p | sed -e 's|^. + dist_elekscriptDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_elekscript_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -96,8 +89,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -108,20 +99,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,6 +125,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -158,25 +141,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -190,6 +169,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -200,7 +180,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -216,6 +195,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -229,6 +210,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -236,6 +218,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + elektraenvdir = $(sysconfdir)/profile.d +@@ -281,7 +265,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-dist_elektraenvSCRIPTS: $(dist_elektraenv_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(elektraenvdir)" || $(mkdir_p) "$(DESTDIR)$(elektraenvdir)" ++ test -z "$(elektraenvdir)" || $(MKDIR_P) "$(DESTDIR)$(elektraenvdir)" + @list='$(dist_elektraenv_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +@@ -300,7 +284,7 @@ uninstall-dist_elektraenvSCRIPTS: + done + install-dist_elektrainitSCRIPTS: $(dist_elektrainit_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(elektrainitdir)" || $(mkdir_p) "$(DESTDIR)$(elektrainitdir)" ++ test -z "$(elektrainitdir)" || $(MKDIR_P) "$(DESTDIR)$(elektrainitdir)" + @list='$(dist_elektrainit_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +@@ -323,13 +307,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-dist_elekscriptDATA: $(dist_elekscript_DATA) + @$(NORMAL_INSTALL) +- test -z "$(elekscriptdir)" || $(mkdir_p) "$(DESTDIR)$(elekscriptdir)" ++ test -z "$(elekscriptdir)" || $(MKDIR_P) "$(DESTDIR)$(elekscriptdir)" + @list='$(dist_elekscript_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -352,22 +332,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -383,7 +362,7 @@ check: check-am + all-am: Makefile $(SCRIPTS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(elektraenvdir)" "$(DESTDIR)$(elektrainitdir)" "$(DESTDIR)$(elekscriptdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -415,7 +394,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -430,12 +409,20 @@ info-am: + install-data-am: install-dist_elekscriptDATA \ + install-dist_elektraenvSCRIPTS install-dist_elektrainitSCRIPTS + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -456,20 +443,24 @@ ps-am: + + uninstall-am: uninstall-dist_elekscriptDATA \ + uninstall-dist_elektraenvSCRIPTS \ +- uninstall-dist_elektrainitSCRIPTS uninstall-info-am ++ uninstall-dist_elektrainitSCRIPTS ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_elekscriptDATA \ + install-dist_elektraenvSCRIPTS install-dist_elektrainitSCRIPTS \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-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-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dist_elekscriptDATA \ + uninstall-dist_elektraenvSCRIPTS \ +- uninstall-dist_elektrainitSCRIPTS uninstall-info-am ++ uninstall-dist_elektrainitSCRIPTS + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/src/backends/berkeleydb/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/berkeleydb/Makefile.in ++++ elektra-0.7.0rc5/src/backends/berkeleydb/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,8 +37,7 @@ target_triplet = @target@ + subdir = src/backends/berkeleydb + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -70,17 +66,22 @@ am_libelektra_berkeleydb_la_OBJECTS = \ + libelektra_berkeleydb_la-berkeleydb.lo + libelektra_berkeleydb_la_OBJECTS = \ + $(am_libelektra_berkeleydb_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_berkeleydb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_berkeleydb_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_berkeleydb_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_berkeleydb_a_SOURCES) \ + $(libelektra_berkeleydb_la_SOURCES) + DIST_SOURCES = $(libelektra_berkeleydb_a_SOURCES) \ +@@ -88,10 +89,7 @@ DIST_SOURCES = $(libelektra_berkeleydb_a + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,8 +115,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -129,20 +125,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -164,6 +151,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -179,25 +167,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -211,6 +195,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -221,7 +206,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -237,6 +221,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -250,6 +236,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -257,6 +244,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -310,21 +299,21 @@ libelektra-berkeleydb.a: $(libelektra_be + $(RANLIB) libelektra-berkeleydb.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -336,7 +325,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-berkeleydb.la: $(libelektra_berkeleydb_la_OBJECTS) $(libelektra_berkeleydb_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_berkeleydb_la_LDFLAGS) $(libelektra_berkeleydb_la_OBJECTS) $(libelektra_berkeleydb_la_LIBADD) $(LIBS) ++ $(libelektra_berkeleydb_la_LINK) -rpath $(backenddir) $(libelektra_berkeleydb_la_OBJECTS) $(libelektra_berkeleydb_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -348,46 +337,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_berkeleydb_a-berkeleydb.o: berkeleydb.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_a_CFLAGS) $(CFLAGS) -MT libelektra_berkeleydb_a-berkeleydb.o -MD -MP -MF "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo" -c -o libelektra_berkeleydb_a-berkeleydb.o `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo" "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Po"; else rm -f "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_a_CFLAGS) $(CFLAGS) -MT libelektra_berkeleydb_a-berkeleydb.o -MD -MP -MF $(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo -c -o libelektra_berkeleydb_a-berkeleydb.o `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo $(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='berkeleydb.c' object='libelektra_berkeleydb_a-berkeleydb.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_a_CFLAGS) $(CFLAGS) -c -o libelektra_berkeleydb_a-berkeleydb.o `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c + + libelektra_berkeleydb_a-berkeleydb.obj: berkeleydb.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_a_CFLAGS) $(CFLAGS) -MT libelektra_berkeleydb_a-berkeleydb.obj -MD -MP -MF "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo" -c -o libelektra_berkeleydb_a-berkeleydb.obj `if test -f 'berkeleydb.c'; then $(CYGPATH_W) 'berkeleydb.c'; else $(CYGPATH_W) '$(srcdir)/berkeleydb.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo" "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Po"; else rm -f "$(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_a_CFLAGS) $(CFLAGS) -MT libelektra_berkeleydb_a-berkeleydb.obj -MD -MP -MF $(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo -c -o libelektra_berkeleydb_a-berkeleydb.obj `if test -f 'berkeleydb.c'; then $(CYGPATH_W) 'berkeleydb.c'; else $(CYGPATH_W) '$(srcdir)/berkeleydb.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Tpo $(DEPDIR)/libelektra_berkeleydb_a-berkeleydb.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='berkeleydb.c' object='libelektra_berkeleydb_a-berkeleydb.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_a_CFLAGS) $(CFLAGS) -c -o libelektra_berkeleydb_a-berkeleydb.obj `if test -f 'berkeleydb.c'; then $(CYGPATH_W) 'berkeleydb.c'; else $(CYGPATH_W) '$(srcdir)/berkeleydb.c'; fi` + + libelektra_berkeleydb_la-berkeleydb.lo: berkeleydb.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_la_CFLAGS) $(CFLAGS) -MT libelektra_berkeleydb_la-berkeleydb.lo -MD -MP -MF "$(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Tpo" -c -o libelektra_berkeleydb_la-berkeleydb.lo `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Tpo" "$(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Plo"; else rm -f "$(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_la_CFLAGS) $(CFLAGS) -MT libelektra_berkeleydb_la-berkeleydb.lo -MD -MP -MF $(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Tpo -c -o libelektra_berkeleydb_la-berkeleydb.lo `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Tpo $(DEPDIR)/libelektra_berkeleydb_la-berkeleydb.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='berkeleydb.c' object='libelektra_berkeleydb_la-berkeleydb.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_la_CFLAGS) $(CFLAGS) -c -o libelektra_berkeleydb_la-berkeleydb.lo `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_berkeleydb_la_CFLAGS) $(CFLAGS) -c -o libelektra_berkeleydb_la-berkeleydb.lo `test -f 'berkeleydb.c' || echo '$(srcdir)/'`berkeleydb.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -395,17 +384,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -417,8 +402,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -428,13 +413,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -448,22 +432,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -479,7 +462,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -514,7 +497,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -528,12 +511,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -554,7 +545,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -562,12 +555,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-backendLTLIBRARIES install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-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-backendLTLIBRARIES uninstall-info-am ++ uninstall-am uninstall-backendLTLIBRARIES + + + ../../libelektra/libelektra.la: +Index: elektra-0.7.0rc5/src/backends/daemon/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/daemon/Makefile.in ++++ elektra-0.7.0rc5/src/backends/daemon/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,13 +18,10 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,8 +41,7 @@ sbin_PROGRAMS = kdbd$(EXEEXT) + subdir = src/backends/daemon + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -80,6 +76,10 @@ libelektra_daemon_la_DEPENDENCIES = ../. + libproto.la + am_libelektra_daemon_la_OBJECTS = libelektra_daemon_la-daemon.lo + libelektra_daemon_la_OBJECTS = $(am_libelektra_daemon_la_OBJECTS) ++libelektra_daemon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_daemon_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_daemon_la_LDFLAGS) $(LDFLAGS) -o $@ + libproto_la_LIBADD = + am_libproto_la_OBJECTS = message.lo protocol.lo ipc.lo sig.lo \ + serial.lo serial_int.lo serial_string.lo serial_key.lo \ +@@ -93,17 +93,21 @@ kdbd_OBJECTS = $(am_kdbd_OBJECTS) + am__DEPENDENCIES_1 = + kdbd_DEPENDENCIES = libproto.la ../../libelektra/libelektra.la \ + $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++kdbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(kdbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_daemon_a_SOURCES) \ + $(libelektra_daemon_la_SOURCES) $(libproto_la_SOURCES) \ + $(kdbd_SOURCES) +@@ -113,10 +117,7 @@ DIST_SOURCES = $(libelektra_daemon_a_SOU + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -142,8 +143,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -154,20 +153,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -189,6 +179,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -204,25 +195,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -236,6 +223,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -246,7 +234,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -262,6 +249,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -275,6 +264,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -282,6 +272,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -341,21 +333,21 @@ libelektra-daemon.a: $(libelektra_daemon + $(RANLIB) libelektra-daemon.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -376,20 +368,20 @@ clean-noinstLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-daemon.la: $(libelektra_daemon_la_OBJECTS) $(libelektra_daemon_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_daemon_la_LDFLAGS) $(libelektra_daemon_la_OBJECTS) $(libelektra_daemon_la_LIBADD) $(LIBS) ++ $(libelektra_daemon_la_LINK) -rpath $(backenddir) $(libelektra_daemon_la_OBJECTS) $(libelektra_daemon_la_LIBADD) $(LIBS) + libproto.la: $(libproto_la_OBJECTS) $(libproto_la_DEPENDENCIES) +- $(LINK) $(libproto_la_LDFLAGS) $(libproto_la_OBJECTS) $(libproto_la_LIBADD) $(LIBS) ++ $(LINK) $(libproto_la_OBJECTS) $(libproto_la_LIBADD) $(LIBS) + install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" ++ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -409,7 +401,7 @@ clean-sbinPROGRAMS: + done + kdbd$(EXEEXT): $(kdbd_OBJECTS) $(kdbd_DEPENDENCIES) + @rm -f kdbd$(EXEEXT) +- $(LINK) $(kdbd_LDFLAGS) $(kdbd_OBJECTS) $(kdbd_LDADD) $(LIBS) ++ $(kdbd_LINK) $(kdbd_OBJECTS) $(kdbd_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -443,225 +435,225 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_daemon_a-daemon.o: daemon.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-daemon.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-daemon.Tpo" -c -o libelektra_daemon_a-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-daemon.Tpo" "$(DEPDIR)/libelektra_daemon_a-daemon.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-daemon.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-daemon.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-daemon.Tpo -c -o libelektra_daemon_a-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-daemon.Tpo $(DEPDIR)/libelektra_daemon_a-daemon.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='daemon.c' object='libelektra_daemon_a-daemon.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c + + libelektra_daemon_a-daemon.obj: daemon.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-daemon.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-daemon.Tpo" -c -o libelektra_daemon_a-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-daemon.Tpo" "$(DEPDIR)/libelektra_daemon_a-daemon.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-daemon.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-daemon.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-daemon.Tpo -c -o libelektra_daemon_a-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-daemon.Tpo $(DEPDIR)/libelektra_daemon_a-daemon.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='daemon.c' object='libelektra_daemon_a-daemon.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi` + + libelektra_daemon_a-message.o: message.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-message.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-message.Tpo" -c -o libelektra_daemon_a-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-message.Tpo" "$(DEPDIR)/libelektra_daemon_a-message.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-message.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-message.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-message.Tpo -c -o libelektra_daemon_a-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-message.Tpo $(DEPDIR)/libelektra_daemon_a-message.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='message.c' object='libelektra_daemon_a-message.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c + + libelektra_daemon_a-message.obj: message.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-message.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-message.Tpo" -c -o libelektra_daemon_a-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-message.Tpo" "$(DEPDIR)/libelektra_daemon_a-message.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-message.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-message.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-message.Tpo -c -o libelektra_daemon_a-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-message.Tpo $(DEPDIR)/libelektra_daemon_a-message.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='message.c' object='libelektra_daemon_a-message.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi` + + libelektra_daemon_a-protocol.o: protocol.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-protocol.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-protocol.Tpo" -c -o libelektra_daemon_a-protocol.o `test -f 'protocol.c' || echo '$(srcdir)/'`protocol.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-protocol.Tpo" "$(DEPDIR)/libelektra_daemon_a-protocol.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-protocol.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-protocol.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-protocol.Tpo -c -o libelektra_daemon_a-protocol.o `test -f 'protocol.c' || echo '$(srcdir)/'`protocol.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-protocol.Tpo $(DEPDIR)/libelektra_daemon_a-protocol.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocol.c' object='libelektra_daemon_a-protocol.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-protocol.o `test -f 'protocol.c' || echo '$(srcdir)/'`protocol.c + + libelektra_daemon_a-protocol.obj: protocol.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-protocol.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-protocol.Tpo" -c -o libelektra_daemon_a-protocol.obj `if test -f 'protocol.c'; then $(CYGPATH_W) 'protocol.c'; else $(CYGPATH_W) '$(srcdir)/protocol.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-protocol.Tpo" "$(DEPDIR)/libelektra_daemon_a-protocol.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-protocol.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-protocol.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-protocol.Tpo -c -o libelektra_daemon_a-protocol.obj `if test -f 'protocol.c'; then $(CYGPATH_W) 'protocol.c'; else $(CYGPATH_W) '$(srcdir)/protocol.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-protocol.Tpo $(DEPDIR)/libelektra_daemon_a-protocol.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocol.c' object='libelektra_daemon_a-protocol.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-protocol.obj `if test -f 'protocol.c'; then $(CYGPATH_W) 'protocol.c'; else $(CYGPATH_W) '$(srcdir)/protocol.c'; fi` + + libelektra_daemon_a-ipc.o: ipc.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-ipc.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-ipc.Tpo" -c -o libelektra_daemon_a-ipc.o `test -f 'ipc.c' || echo '$(srcdir)/'`ipc.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-ipc.Tpo" "$(DEPDIR)/libelektra_daemon_a-ipc.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-ipc.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-ipc.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-ipc.Tpo -c -o libelektra_daemon_a-ipc.o `test -f 'ipc.c' || echo '$(srcdir)/'`ipc.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-ipc.Tpo $(DEPDIR)/libelektra_daemon_a-ipc.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ipc.c' object='libelektra_daemon_a-ipc.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-ipc.o `test -f 'ipc.c' || echo '$(srcdir)/'`ipc.c + + libelektra_daemon_a-ipc.obj: ipc.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-ipc.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-ipc.Tpo" -c -o libelektra_daemon_a-ipc.obj `if test -f 'ipc.c'; then $(CYGPATH_W) 'ipc.c'; else $(CYGPATH_W) '$(srcdir)/ipc.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-ipc.Tpo" "$(DEPDIR)/libelektra_daemon_a-ipc.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-ipc.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-ipc.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-ipc.Tpo -c -o libelektra_daemon_a-ipc.obj `if test -f 'ipc.c'; then $(CYGPATH_W) 'ipc.c'; else $(CYGPATH_W) '$(srcdir)/ipc.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-ipc.Tpo $(DEPDIR)/libelektra_daemon_a-ipc.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ipc.c' object='libelektra_daemon_a-ipc.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-ipc.obj `if test -f 'ipc.c'; then $(CYGPATH_W) 'ipc.c'; else $(CYGPATH_W) '$(srcdir)/ipc.c'; fi` + + libelektra_daemon_a-sig.o: sig.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-sig.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-sig.Tpo" -c -o libelektra_daemon_a-sig.o `test -f 'sig.c' || echo '$(srcdir)/'`sig.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-sig.Tpo" "$(DEPDIR)/libelektra_daemon_a-sig.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-sig.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-sig.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-sig.Tpo -c -o libelektra_daemon_a-sig.o `test -f 'sig.c' || echo '$(srcdir)/'`sig.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-sig.Tpo $(DEPDIR)/libelektra_daemon_a-sig.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sig.c' object='libelektra_daemon_a-sig.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-sig.o `test -f 'sig.c' || echo '$(srcdir)/'`sig.c + + libelektra_daemon_a-sig.obj: sig.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-sig.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-sig.Tpo" -c -o libelektra_daemon_a-sig.obj `if test -f 'sig.c'; then $(CYGPATH_W) 'sig.c'; else $(CYGPATH_W) '$(srcdir)/sig.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-sig.Tpo" "$(DEPDIR)/libelektra_daemon_a-sig.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-sig.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-sig.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-sig.Tpo -c -o libelektra_daemon_a-sig.obj `if test -f 'sig.c'; then $(CYGPATH_W) 'sig.c'; else $(CYGPATH_W) '$(srcdir)/sig.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-sig.Tpo $(DEPDIR)/libelektra_daemon_a-sig.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sig.c' object='libelektra_daemon_a-sig.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-sig.obj `if test -f 'sig.c'; then $(CYGPATH_W) 'sig.c'; else $(CYGPATH_W) '$(srcdir)/sig.c'; fi` + + libelektra_daemon_a-serial.o: serial.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial.Tpo" -c -o libelektra_daemon_a-serial.o `test -f 'serial.c' || echo '$(srcdir)/'`serial.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial.Tpo -c -o libelektra_daemon_a-serial.o `test -f 'serial.c' || echo '$(srcdir)/'`serial.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial.Tpo $(DEPDIR)/libelektra_daemon_a-serial.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial.c' object='libelektra_daemon_a-serial.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial.o `test -f 'serial.c' || echo '$(srcdir)/'`serial.c + + libelektra_daemon_a-serial.obj: serial.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial.Tpo" -c -o libelektra_daemon_a-serial.obj `if test -f 'serial.c'; then $(CYGPATH_W) 'serial.c'; else $(CYGPATH_W) '$(srcdir)/serial.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial.Tpo -c -o libelektra_daemon_a-serial.obj `if test -f 'serial.c'; then $(CYGPATH_W) 'serial.c'; else $(CYGPATH_W) '$(srcdir)/serial.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial.Tpo $(DEPDIR)/libelektra_daemon_a-serial.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial.c' object='libelektra_daemon_a-serial.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial.obj `if test -f 'serial.c'; then $(CYGPATH_W) 'serial.c'; else $(CYGPATH_W) '$(srcdir)/serial.c'; fi` + + libelektra_daemon_a-serial_int.o: serial_int.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_int.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_int.Tpo" -c -o libelektra_daemon_a-serial_int.o `test -f 'serial_int.c' || echo '$(srcdir)/'`serial_int.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_int.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_int.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_int.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_int.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_int.Tpo -c -o libelektra_daemon_a-serial_int.o `test -f 'serial_int.c' || echo '$(srcdir)/'`serial_int.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_int.Tpo $(DEPDIR)/libelektra_daemon_a-serial_int.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_int.c' object='libelektra_daemon_a-serial_int.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_int.o `test -f 'serial_int.c' || echo '$(srcdir)/'`serial_int.c + + libelektra_daemon_a-serial_int.obj: serial_int.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_int.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_int.Tpo" -c -o libelektra_daemon_a-serial_int.obj `if test -f 'serial_int.c'; then $(CYGPATH_W) 'serial_int.c'; else $(CYGPATH_W) '$(srcdir)/serial_int.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_int.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_int.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_int.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_int.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_int.Tpo -c -o libelektra_daemon_a-serial_int.obj `if test -f 'serial_int.c'; then $(CYGPATH_W) 'serial_int.c'; else $(CYGPATH_W) '$(srcdir)/serial_int.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_int.Tpo $(DEPDIR)/libelektra_daemon_a-serial_int.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_int.c' object='libelektra_daemon_a-serial_int.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_int.obj `if test -f 'serial_int.c'; then $(CYGPATH_W) 'serial_int.c'; else $(CYGPATH_W) '$(srcdir)/serial_int.c'; fi` + + libelektra_daemon_a-serial_string.o: serial_string.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_string.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_string.Tpo" -c -o libelektra_daemon_a-serial_string.o `test -f 'serial_string.c' || echo '$(srcdir)/'`serial_string.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_string.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_string.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_string.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_string.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_string.Tpo -c -o libelektra_daemon_a-serial_string.o `test -f 'serial_string.c' || echo '$(srcdir)/'`serial_string.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_string.Tpo $(DEPDIR)/libelektra_daemon_a-serial_string.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_string.c' object='libelektra_daemon_a-serial_string.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_string.o `test -f 'serial_string.c' || echo '$(srcdir)/'`serial_string.c + + libelektra_daemon_a-serial_string.obj: serial_string.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_string.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_string.Tpo" -c -o libelektra_daemon_a-serial_string.obj `if test -f 'serial_string.c'; then $(CYGPATH_W) 'serial_string.c'; else $(CYGPATH_W) '$(srcdir)/serial_string.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_string.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_string.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_string.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_string.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_string.Tpo -c -o libelektra_daemon_a-serial_string.obj `if test -f 'serial_string.c'; then $(CYGPATH_W) 'serial_string.c'; else $(CYGPATH_W) '$(srcdir)/serial_string.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_string.Tpo $(DEPDIR)/libelektra_daemon_a-serial_string.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_string.c' object='libelektra_daemon_a-serial_string.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_string.obj `if test -f 'serial_string.c'; then $(CYGPATH_W) 'serial_string.c'; else $(CYGPATH_W) '$(srcdir)/serial_string.c'; fi` + + libelektra_daemon_a-serial_key.o: serial_key.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_key.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_key.Tpo" -c -o libelektra_daemon_a-serial_key.o `test -f 'serial_key.c' || echo '$(srcdir)/'`serial_key.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_key.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_key.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_key.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_key.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_key.Tpo -c -o libelektra_daemon_a-serial_key.o `test -f 'serial_key.c' || echo '$(srcdir)/'`serial_key.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_key.Tpo $(DEPDIR)/libelektra_daemon_a-serial_key.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_key.c' object='libelektra_daemon_a-serial_key.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_key.o `test -f 'serial_key.c' || echo '$(srcdir)/'`serial_key.c + + libelektra_daemon_a-serial_key.obj: serial_key.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_key.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_key.Tpo" -c -o libelektra_daemon_a-serial_key.obj `if test -f 'serial_key.c'; then $(CYGPATH_W) 'serial_key.c'; else $(CYGPATH_W) '$(srcdir)/serial_key.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_key.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_key.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_key.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_key.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_key.Tpo -c -o libelektra_daemon_a-serial_key.obj `if test -f 'serial_key.c'; then $(CYGPATH_W) 'serial_key.c'; else $(CYGPATH_W) '$(srcdir)/serial_key.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_key.Tpo $(DEPDIR)/libelektra_daemon_a-serial_key.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_key.c' object='libelektra_daemon_a-serial_key.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_key.obj `if test -f 'serial_key.c'; then $(CYGPATH_W) 'serial_key.c'; else $(CYGPATH_W) '$(srcdir)/serial_key.c'; fi` + + libelektra_daemon_a-serial_keyset.o: serial_keyset.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_keyset.o -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo" -c -o libelektra_daemon_a-serial_keyset.o `test -f 'serial_keyset.c' || echo '$(srcdir)/'`serial_keyset.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_keyset.o -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo -c -o libelektra_daemon_a-serial_keyset.o `test -f 'serial_keyset.c' || echo '$(srcdir)/'`serial_keyset.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo $(DEPDIR)/libelektra_daemon_a-serial_keyset.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_keyset.c' object='libelektra_daemon_a-serial_keyset.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_keyset.o `test -f 'serial_keyset.c' || echo '$(srcdir)/'`serial_keyset.c + + libelektra_daemon_a-serial_keyset.obj: serial_keyset.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_keyset.obj -MD -MP -MF "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo" -c -o libelektra_daemon_a-serial_keyset.obj `if test -f 'serial_keyset.c'; then $(CYGPATH_W) 'serial_keyset.c'; else $(CYGPATH_W) '$(srcdir)/serial_keyset.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo" "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Po"; else rm -f "$(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -MT libelektra_daemon_a-serial_keyset.obj -MD -MP -MF $(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo -c -o libelektra_daemon_a-serial_keyset.obj `if test -f 'serial_keyset.c'; then $(CYGPATH_W) 'serial_keyset.c'; else $(CYGPATH_W) '$(srcdir)/serial_keyset.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_a-serial_keyset.Tpo $(DEPDIR)/libelektra_daemon_a-serial_keyset.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serial_keyset.c' object='libelektra_daemon_a-serial_keyset.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_a_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_a-serial_keyset.obj `if test -f 'serial_keyset.c'; then $(CYGPATH_W) 'serial_keyset.c'; else $(CYGPATH_W) '$(srcdir)/serial_keyset.c'; fi` + + libelektra_daemon_la-daemon.lo: daemon.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_la_CFLAGS) $(CFLAGS) -MT libelektra_daemon_la-daemon.lo -MD -MP -MF "$(DEPDIR)/libelektra_daemon_la-daemon.Tpo" -c -o libelektra_daemon_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_daemon_la-daemon.Tpo" "$(DEPDIR)/libelektra_daemon_la-daemon.Plo"; else rm -f "$(DEPDIR)/libelektra_daemon_la-daemon.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_la_CFLAGS) $(CFLAGS) -MT libelektra_daemon_la-daemon.lo -MD -MP -MF $(DEPDIR)/libelektra_daemon_la-daemon.Tpo -c -o libelektra_daemon_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_daemon_la-daemon.Tpo $(DEPDIR)/libelektra_daemon_la-daemon.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='daemon.c' object='libelektra_daemon_la-daemon.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_la_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_daemon_la_CFLAGS) $(CFLAGS) -c -o libelektra_daemon_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c + + kdbd-main.o: main.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-main.o -MD -MP -MF "$(DEPDIR)/kdbd-main.Tpo" -c -o kdbd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-main.Tpo" "$(DEPDIR)/kdbd-main.Po"; else rm -f "$(DEPDIR)/kdbd-main.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-main.o -MD -MP -MF $(DEPDIR)/kdbd-main.Tpo -c -o kdbd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-main.Tpo $(DEPDIR)/kdbd-main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='kdbd-main.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c + + kdbd-main.obj: main.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-main.obj -MD -MP -MF "$(DEPDIR)/kdbd-main.Tpo" -c -o kdbd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-main.Tpo" "$(DEPDIR)/kdbd-main.Po"; else rm -f "$(DEPDIR)/kdbd-main.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-main.obj -MD -MP -MF $(DEPDIR)/kdbd-main.Tpo -c -o kdbd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-main.Tpo $(DEPDIR)/kdbd-main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='kdbd-main.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` + + kdbd-kdbd.o: kdbd.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdbd.o -MD -MP -MF "$(DEPDIR)/kdbd-kdbd.Tpo" -c -o kdbd-kdbd.o `test -f 'kdbd.c' || echo '$(srcdir)/'`kdbd.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-kdbd.Tpo" "$(DEPDIR)/kdbd-kdbd.Po"; else rm -f "$(DEPDIR)/kdbd-kdbd.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdbd.o -MD -MP -MF $(DEPDIR)/kdbd-kdbd.Tpo -c -o kdbd-kdbd.o `test -f 'kdbd.c' || echo '$(srcdir)/'`kdbd.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-kdbd.Tpo $(DEPDIR)/kdbd-kdbd.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbd.c' object='kdbd-kdbd.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-kdbd.o `test -f 'kdbd.c' || echo '$(srcdir)/'`kdbd.c + + kdbd-kdbd.obj: kdbd.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdbd.obj -MD -MP -MF "$(DEPDIR)/kdbd-kdbd.Tpo" -c -o kdbd-kdbd.obj `if test -f 'kdbd.c'; then $(CYGPATH_W) 'kdbd.c'; else $(CYGPATH_W) '$(srcdir)/kdbd.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-kdbd.Tpo" "$(DEPDIR)/kdbd-kdbd.Po"; else rm -f "$(DEPDIR)/kdbd-kdbd.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdbd.obj -MD -MP -MF $(DEPDIR)/kdbd-kdbd.Tpo -c -o kdbd-kdbd.obj `if test -f 'kdbd.c'; then $(CYGPATH_W) 'kdbd.c'; else $(CYGPATH_W) '$(srcdir)/kdbd.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-kdbd.Tpo $(DEPDIR)/kdbd-kdbd.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbd.c' object='kdbd-kdbd.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-kdbd.obj `if test -f 'kdbd.c'; then $(CYGPATH_W) 'kdbd.c'; else $(CYGPATH_W) '$(srcdir)/kdbd.c'; fi` + + kdbd-kdb_wrapper.o: kdb_wrapper.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdb_wrapper.o -MD -MP -MF "$(DEPDIR)/kdbd-kdb_wrapper.Tpo" -c -o kdbd-kdb_wrapper.o `test -f 'kdb_wrapper.c' || echo '$(srcdir)/'`kdb_wrapper.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-kdb_wrapper.Tpo" "$(DEPDIR)/kdbd-kdb_wrapper.Po"; else rm -f "$(DEPDIR)/kdbd-kdb_wrapper.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdb_wrapper.o -MD -MP -MF $(DEPDIR)/kdbd-kdb_wrapper.Tpo -c -o kdbd-kdb_wrapper.o `test -f 'kdb_wrapper.c' || echo '$(srcdir)/'`kdb_wrapper.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-kdb_wrapper.Tpo $(DEPDIR)/kdbd-kdb_wrapper.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb_wrapper.c' object='kdbd-kdb_wrapper.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-kdb_wrapper.o `test -f 'kdb_wrapper.c' || echo '$(srcdir)/'`kdb_wrapper.c + + kdbd-kdb_wrapper.obj: kdb_wrapper.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdb_wrapper.obj -MD -MP -MF "$(DEPDIR)/kdbd-kdb_wrapper.Tpo" -c -o kdbd-kdb_wrapper.obj `if test -f 'kdb_wrapper.c'; then $(CYGPATH_W) 'kdb_wrapper.c'; else $(CYGPATH_W) '$(srcdir)/kdb_wrapper.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-kdb_wrapper.Tpo" "$(DEPDIR)/kdbd-kdb_wrapper.Po"; else rm -f "$(DEPDIR)/kdbd-kdb_wrapper.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-kdb_wrapper.obj -MD -MP -MF $(DEPDIR)/kdbd-kdb_wrapper.Tpo -c -o kdbd-kdb_wrapper.obj `if test -f 'kdb_wrapper.c'; then $(CYGPATH_W) 'kdb_wrapper.c'; else $(CYGPATH_W) '$(srcdir)/kdb_wrapper.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-kdb_wrapper.Tpo $(DEPDIR)/kdbd-kdb_wrapper.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb_wrapper.c' object='kdbd-kdb_wrapper.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-kdb_wrapper.obj `if test -f 'kdb_wrapper.c'; then $(CYGPATH_W) 'kdb_wrapper.c'; else $(CYGPATH_W) '$(srcdir)/kdb_wrapper.c'; fi` + + kdbd-thread.o: thread.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-thread.o -MD -MP -MF "$(DEPDIR)/kdbd-thread.Tpo" -c -o kdbd-thread.o `test -f 'thread.c' || echo '$(srcdir)/'`thread.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-thread.Tpo" "$(DEPDIR)/kdbd-thread.Po"; else rm -f "$(DEPDIR)/kdbd-thread.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-thread.o -MD -MP -MF $(DEPDIR)/kdbd-thread.Tpo -c -o kdbd-thread.o `test -f 'thread.c' || echo '$(srcdir)/'`thread.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-thread.Tpo $(DEPDIR)/kdbd-thread.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread.c' object='kdbd-thread.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-thread.o `test -f 'thread.c' || echo '$(srcdir)/'`thread.c + + kdbd-thread.obj: thread.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-thread.obj -MD -MP -MF "$(DEPDIR)/kdbd-thread.Tpo" -c -o kdbd-thread.obj `if test -f 'thread.c'; then $(CYGPATH_W) 'thread.c'; else $(CYGPATH_W) '$(srcdir)/thread.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdbd-thread.Tpo" "$(DEPDIR)/kdbd-thread.Po"; else rm -f "$(DEPDIR)/kdbd-thread.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -MT kdbd-thread.obj -MD -MP -MF $(DEPDIR)/kdbd-thread.Tpo -c -o kdbd-thread.obj `if test -f 'thread.c'; then $(CYGPATH_W) 'thread.c'; else $(CYGPATH_W) '$(srcdir)/thread.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdbd-thread.Tpo $(DEPDIR)/kdbd-thread.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thread.c' object='kdbd-thread.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdbd_CFLAGS) $(CFLAGS) -c -o kdbd-thread.obj `if test -f 'thread.c'; then $(CYGPATH_W) 'thread.c'; else $(CYGPATH_W) '$(srcdir)/thread.c'; fi` +@@ -672,17 +664,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -694,8 +682,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -705,13 +693,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -725,22 +712,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -756,7 +742,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) + installdirs: + for dir in "$(DESTDIR)$(backenddir)" "$(DESTDIR)$(sbindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -792,7 +778,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -806,12 +792,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: install-sbinPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -832,8 +826,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am \ +- uninstall-sbinPROGRAMS ++uninstall-am: uninstall-backendLTLIBRARIES uninstall-sbinPROGRAMS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -842,13 +837,15 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-backendLTLIBRARIES install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-sbinPROGRAMS install-strip installcheck \ ++ 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-sbinPROGRAMS 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-backendLTLIBRARIES \ +- uninstall-info-am uninstall-sbinPROGRAMS ++ uninstall-sbinPROGRAMS + + + # kdbd_static_SOURCES = main.c kdbd.g kdbd.c kdb_wrapper.h kdb_wrapper.c thread.h thread.c +Index: elektra-0.7.0rc5/src/backends/filesys/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/filesys/Makefile.in ++++ elektra-0.7.0rc5/src/backends/filesys/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,8 +37,7 @@ target_triplet = @target@ + subdir = src/backends/filesys + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -66,17 +62,22 @@ LTLIBRARIES = $(backend_LTLIBRARIES) + libelektra_filesys_la_DEPENDENCIES = ../../libelektra/libelektra.la + am_libelektra_filesys_la_OBJECTS = libelektra_filesys_la-filesys.lo + libelektra_filesys_la_OBJECTS = $(am_libelektra_filesys_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_filesys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_filesys_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_filesys_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_filesys_a_SOURCES) \ + $(libelektra_filesys_la_SOURCES) + DIST_SOURCES = $(libelektra_filesys_a_SOURCES) \ +@@ -84,10 +85,7 @@ DIST_SOURCES = $(libelektra_filesys_a_SO + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -113,8 +111,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -125,20 +121,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -160,6 +147,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -175,25 +163,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -207,6 +191,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -217,7 +202,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -233,6 +217,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -246,6 +232,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -253,6 +240,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -306,21 +295,21 @@ libelektra-filesys.a: $(libelektra_files + $(RANLIB) libelektra-filesys.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -332,7 +321,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-filesys.la: $(libelektra_filesys_la_OBJECTS) $(libelektra_filesys_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_filesys_la_LDFLAGS) $(libelektra_filesys_la_OBJECTS) $(libelektra_filesys_la_LIBADD) $(LIBS) ++ $(libelektra_filesys_la_LINK) -rpath $(backenddir) $(libelektra_filesys_la_OBJECTS) $(libelektra_filesys_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -344,46 +333,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_filesys_la-filesys.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_filesys_a-filesys.o: filesys.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_a_CFLAGS) $(CFLAGS) -MT libelektra_filesys_a-filesys.o -MD -MP -MF "$(DEPDIR)/libelektra_filesys_a-filesys.Tpo" -c -o libelektra_filesys_a-filesys.o `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_filesys_a-filesys.Tpo" "$(DEPDIR)/libelektra_filesys_a-filesys.Po"; else rm -f "$(DEPDIR)/libelektra_filesys_a-filesys.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_a_CFLAGS) $(CFLAGS) -MT libelektra_filesys_a-filesys.o -MD -MP -MF $(DEPDIR)/libelektra_filesys_a-filesys.Tpo -c -o libelektra_filesys_a-filesys.o `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_filesys_a-filesys.Tpo $(DEPDIR)/libelektra_filesys_a-filesys.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filesys.c' object='libelektra_filesys_a-filesys.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_a_CFLAGS) $(CFLAGS) -c -o libelektra_filesys_a-filesys.o `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c + + libelektra_filesys_a-filesys.obj: filesys.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_a_CFLAGS) $(CFLAGS) -MT libelektra_filesys_a-filesys.obj -MD -MP -MF "$(DEPDIR)/libelektra_filesys_a-filesys.Tpo" -c -o libelektra_filesys_a-filesys.obj `if test -f 'filesys.c'; then $(CYGPATH_W) 'filesys.c'; else $(CYGPATH_W) '$(srcdir)/filesys.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_filesys_a-filesys.Tpo" "$(DEPDIR)/libelektra_filesys_a-filesys.Po"; else rm -f "$(DEPDIR)/libelektra_filesys_a-filesys.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_a_CFLAGS) $(CFLAGS) -MT libelektra_filesys_a-filesys.obj -MD -MP -MF $(DEPDIR)/libelektra_filesys_a-filesys.Tpo -c -o libelektra_filesys_a-filesys.obj `if test -f 'filesys.c'; then $(CYGPATH_W) 'filesys.c'; else $(CYGPATH_W) '$(srcdir)/filesys.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_filesys_a-filesys.Tpo $(DEPDIR)/libelektra_filesys_a-filesys.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filesys.c' object='libelektra_filesys_a-filesys.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_a_CFLAGS) $(CFLAGS) -c -o libelektra_filesys_a-filesys.obj `if test -f 'filesys.c'; then $(CYGPATH_W) 'filesys.c'; else $(CYGPATH_W) '$(srcdir)/filesys.c'; fi` + + libelektra_filesys_la-filesys.lo: filesys.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_la_CFLAGS) $(CFLAGS) -MT libelektra_filesys_la-filesys.lo -MD -MP -MF "$(DEPDIR)/libelektra_filesys_la-filesys.Tpo" -c -o libelektra_filesys_la-filesys.lo `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_filesys_la-filesys.Tpo" "$(DEPDIR)/libelektra_filesys_la-filesys.Plo"; else rm -f "$(DEPDIR)/libelektra_filesys_la-filesys.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_la_CFLAGS) $(CFLAGS) -MT libelektra_filesys_la-filesys.lo -MD -MP -MF $(DEPDIR)/libelektra_filesys_la-filesys.Tpo -c -o libelektra_filesys_la-filesys.lo `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_filesys_la-filesys.Tpo $(DEPDIR)/libelektra_filesys_la-filesys.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filesys.c' object='libelektra_filesys_la-filesys.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_la_CFLAGS) $(CFLAGS) -c -o libelektra_filesys_la-filesys.lo `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_filesys_la_CFLAGS) $(CFLAGS) -c -o libelektra_filesys_la-filesys.lo `test -f 'filesys.c' || echo '$(srcdir)/'`filesys.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -391,17 +380,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -413,8 +398,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -424,13 +409,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -444,22 +428,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -475,7 +458,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -510,7 +493,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -524,12 +507,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -550,7 +541,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -558,13 +551,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-backendLTLIBRARIES \ +- uninstall-info-am ++ tags uninstall uninstall-am uninstall-backendLTLIBRARIES + + + clean-local: +Index: elektra-0.7.0rc5/src/backends/fstab/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/fstab/Makefile.in ++++ elektra-0.7.0rc5/src/backends/fstab/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,13 +17,10 @@ + # $Id$ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ target_triplet = @target@ + subdir = src/backends/fstab + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -67,27 +63,29 @@ LTLIBRARIES = $(backend_LTLIBRARIES) + libelektra_fstab_la_DEPENDENCIES = ../../libelektra/libelektra.la + am_libelektra_fstab_la_OBJECTS = libelektra_fstab_la-fstab.lo + libelektra_fstab_la_OBJECTS = $(am_libelektra_fstab_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_fstab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_fstab_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_fstab_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_fstab_a_SOURCES) $(libelektra_fstab_la_SOURCES) + DIST_SOURCES = $(libelektra_fstab_a_SOURCES) \ + $(libelektra_fstab_la_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -113,8 +111,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -125,20 +121,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -160,6 +147,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -175,25 +163,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -207,6 +191,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -217,7 +202,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -233,6 +217,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -246,6 +232,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -253,6 +240,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -306,21 +295,21 @@ libelektra-fstab.a: $(libelektra_fstab_a + $(RANLIB) libelektra-fstab.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -332,7 +321,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-fstab.la: $(libelektra_fstab_la_OBJECTS) $(libelektra_fstab_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_fstab_la_LDFLAGS) $(libelektra_fstab_la_OBJECTS) $(libelektra_fstab_la_LIBADD) $(LIBS) ++ $(libelektra_fstab_la_LINK) -rpath $(backenddir) $(libelektra_fstab_la_OBJECTS) $(libelektra_fstab_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -344,46 +333,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_fstab_la-fstab.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_fstab_a-fstab.o: fstab.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_a_CFLAGS) $(CFLAGS) -MT libelektra_fstab_a-fstab.o -MD -MP -MF "$(DEPDIR)/libelektra_fstab_a-fstab.Tpo" -c -o libelektra_fstab_a-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_fstab_a-fstab.Tpo" "$(DEPDIR)/libelektra_fstab_a-fstab.Po"; else rm -f "$(DEPDIR)/libelektra_fstab_a-fstab.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_a_CFLAGS) $(CFLAGS) -MT libelektra_fstab_a-fstab.o -MD -MP -MF $(DEPDIR)/libelektra_fstab_a-fstab.Tpo -c -o libelektra_fstab_a-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_fstab_a-fstab.Tpo $(DEPDIR)/libelektra_fstab_a-fstab.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='libelektra_fstab_a-fstab.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_a_CFLAGS) $(CFLAGS) -c -o libelektra_fstab_a-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c + + libelektra_fstab_a-fstab.obj: fstab.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_a_CFLAGS) $(CFLAGS) -MT libelektra_fstab_a-fstab.obj -MD -MP -MF "$(DEPDIR)/libelektra_fstab_a-fstab.Tpo" -c -o libelektra_fstab_a-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_fstab_a-fstab.Tpo" "$(DEPDIR)/libelektra_fstab_a-fstab.Po"; else rm -f "$(DEPDIR)/libelektra_fstab_a-fstab.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_a_CFLAGS) $(CFLAGS) -MT libelektra_fstab_a-fstab.obj -MD -MP -MF $(DEPDIR)/libelektra_fstab_a-fstab.Tpo -c -o libelektra_fstab_a-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_fstab_a-fstab.Tpo $(DEPDIR)/libelektra_fstab_a-fstab.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='libelektra_fstab_a-fstab.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_a_CFLAGS) $(CFLAGS) -c -o libelektra_fstab_a-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi` + + libelektra_fstab_la-fstab.lo: fstab.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_la_CFLAGS) $(CFLAGS) -MT libelektra_fstab_la-fstab.lo -MD -MP -MF "$(DEPDIR)/libelektra_fstab_la-fstab.Tpo" -c -o libelektra_fstab_la-fstab.lo `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_fstab_la-fstab.Tpo" "$(DEPDIR)/libelektra_fstab_la-fstab.Plo"; else rm -f "$(DEPDIR)/libelektra_fstab_la-fstab.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_la_CFLAGS) $(CFLAGS) -MT libelektra_fstab_la-fstab.lo -MD -MP -MF $(DEPDIR)/libelektra_fstab_la-fstab.Tpo -c -o libelektra_fstab_la-fstab.lo `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_fstab_la-fstab.Tpo $(DEPDIR)/libelektra_fstab_la-fstab.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='libelektra_fstab_la-fstab.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_la_CFLAGS) $(CFLAGS) -c -o libelektra_fstab_la-fstab.lo `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_fstab_la_CFLAGS) $(CFLAGS) -c -o libelektra_fstab_la-fstab.lo `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -391,17 +380,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -413,8 +398,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -424,13 +409,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -444,22 +428,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -475,7 +458,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -510,7 +493,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -524,12 +507,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -550,7 +541,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -558,13 +551,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-backendLTLIBRARIES \ +- uninstall-info-am ++ tags uninstall uninstall-am uninstall-backendLTLIBRARIES + + + clean-local: +Index: elektra-0.7.0rc5/src/backends/gconf/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/gconf/Makefile.in ++++ elektra-0.7.0rc5/src/backends/gconf/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -21,13 +21,10 @@ + # + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -46,8 +43,7 @@ target_triplet = @target@ + subdir = src/backends/gconf + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -73,27 +69,29 @@ libelektra_gconf_la_DEPENDENCIES = $(am_ + ../../libelektra/libelektra.la + am_libelektra_gconf_la_OBJECTS = libelektra_gconf_la-gconf.lo + libelektra_gconf_la_OBJECTS = $(am_libelektra_gconf_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_gconf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_gconf_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_gconf_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_gconf_a_SOURCES) $(libelektra_gconf_la_SOURCES) + DIST_SOURCES = $(libelektra_gconf_a_SOURCES) \ + $(libelektra_gconf_la_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -119,8 +117,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -131,20 +127,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -166,6 +153,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -181,25 +169,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -213,6 +197,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -223,7 +208,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -239,6 +223,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -252,6 +238,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -259,6 +246,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + +@@ -314,21 +303,21 @@ libelektra-gconf.a: $(libelektra_gconf_a + $(RANLIB) libelektra-gconf.a + install-hlvlbackendLTLIBRARIES: $(hlvlbackend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(hlvlbackenddir)" || $(mkdir_p) "$(DESTDIR)$(hlvlbackenddir)" ++ test -z "$(hlvlbackenddir)" || $(MKDIR_P) "$(DESTDIR)$(hlvlbackenddir)" + @list='$(hlvlbackend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(hlvlbackendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hlvlbackenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(hlvlbackendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hlvlbackenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hlvlbackendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hlvlbackenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hlvlbackendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hlvlbackenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-hlvlbackendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(hlvlbackend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(hlvlbackend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hlvlbackenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hlvlbackenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hlvlbackenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hlvlbackenddir)/$$p"; \ + done + + clean-hlvlbackendLTLIBRARIES: +@@ -340,7 +329,7 @@ clean-hlvlbackendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-gconf.la: $(libelektra_gconf_la_OBJECTS) $(libelektra_gconf_la_DEPENDENCIES) +- $(LINK) -rpath $(hlvlbackenddir) $(libelektra_gconf_la_LDFLAGS) $(libelektra_gconf_la_OBJECTS) $(libelektra_gconf_la_LIBADD) $(LIBS) ++ $(libelektra_gconf_la_LINK) -rpath $(hlvlbackenddir) $(libelektra_gconf_la_OBJECTS) $(libelektra_gconf_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -352,46 +341,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_gconf_la-gconf.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_gconf_a-gconf.o: gconf.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_a_CFLAGS) $(CFLAGS) -MT libelektra_gconf_a-gconf.o -MD -MP -MF "$(DEPDIR)/libelektra_gconf_a-gconf.Tpo" -c -o libelektra_gconf_a-gconf.o `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_gconf_a-gconf.Tpo" "$(DEPDIR)/libelektra_gconf_a-gconf.Po"; else rm -f "$(DEPDIR)/libelektra_gconf_a-gconf.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_a_CFLAGS) $(CFLAGS) -MT libelektra_gconf_a-gconf.o -MD -MP -MF $(DEPDIR)/libelektra_gconf_a-gconf.Tpo -c -o libelektra_gconf_a-gconf.o `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_gconf_a-gconf.Tpo $(DEPDIR)/libelektra_gconf_a-gconf.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gconf.c' object='libelektra_gconf_a-gconf.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_a_CFLAGS) $(CFLAGS) -c -o libelektra_gconf_a-gconf.o `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c + + libelektra_gconf_a-gconf.obj: gconf.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_a_CFLAGS) $(CFLAGS) -MT libelektra_gconf_a-gconf.obj -MD -MP -MF "$(DEPDIR)/libelektra_gconf_a-gconf.Tpo" -c -o libelektra_gconf_a-gconf.obj `if test -f 'gconf.c'; then $(CYGPATH_W) 'gconf.c'; else $(CYGPATH_W) '$(srcdir)/gconf.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_gconf_a-gconf.Tpo" "$(DEPDIR)/libelektra_gconf_a-gconf.Po"; else rm -f "$(DEPDIR)/libelektra_gconf_a-gconf.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_a_CFLAGS) $(CFLAGS) -MT libelektra_gconf_a-gconf.obj -MD -MP -MF $(DEPDIR)/libelektra_gconf_a-gconf.Tpo -c -o libelektra_gconf_a-gconf.obj `if test -f 'gconf.c'; then $(CYGPATH_W) 'gconf.c'; else $(CYGPATH_W) '$(srcdir)/gconf.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_gconf_a-gconf.Tpo $(DEPDIR)/libelektra_gconf_a-gconf.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gconf.c' object='libelektra_gconf_a-gconf.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_a_CFLAGS) $(CFLAGS) -c -o libelektra_gconf_a-gconf.obj `if test -f 'gconf.c'; then $(CYGPATH_W) 'gconf.c'; else $(CYGPATH_W) '$(srcdir)/gconf.c'; fi` + + libelektra_gconf_la-gconf.lo: gconf.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_la_CFLAGS) $(CFLAGS) -MT libelektra_gconf_la-gconf.lo -MD -MP -MF "$(DEPDIR)/libelektra_gconf_la-gconf.Tpo" -c -o libelektra_gconf_la-gconf.lo `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_gconf_la-gconf.Tpo" "$(DEPDIR)/libelektra_gconf_la-gconf.Plo"; else rm -f "$(DEPDIR)/libelektra_gconf_la-gconf.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_la_CFLAGS) $(CFLAGS) -MT libelektra_gconf_la-gconf.lo -MD -MP -MF $(DEPDIR)/libelektra_gconf_la-gconf.Tpo -c -o libelektra_gconf_la-gconf.lo `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_gconf_la-gconf.Tpo $(DEPDIR)/libelektra_gconf_la-gconf.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gconf.c' object='libelektra_gconf_la-gconf.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_la_CFLAGS) $(CFLAGS) -c -o libelektra_gconf_la-gconf.lo `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_gconf_la_CFLAGS) $(CFLAGS) -c -o libelektra_gconf_la-gconf.lo `test -f 'gconf.c' || echo '$(srcdir)/'`gconf.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -399,17 +388,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -421,8 +406,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -432,13 +417,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -452,22 +436,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -483,7 +466,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(hlvlbackenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -518,7 +501,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -532,12 +515,20 @@ info-am: + + install-data-am: install-hlvlbackendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -558,21 +549,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-hlvlbackendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-hlvlbackendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-hlvlbackendLTLIBRARIES clean-libtool \ + clean-noinstLIBRARIES 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-exec install-exec-am \ +- install-hlvlbackendLTLIBRARIES install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-hlvlbackendLTLIBRARIES \ ++ 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-hlvlbackendLTLIBRARIES \ +- uninstall-info-am ++ uninstall-am uninstall-hlvlbackendLTLIBRARIES + + + ../../libelektra/libelektra.la: +Index: elektra-0.7.0rc5/src/backends/hosts/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/hosts/Makefile.in ++++ elektra-0.7.0rc5/src/backends/hosts/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -19,13 +19,10 @@ + #EXTRA_DIST = hosts.c README + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,8 +41,7 @@ target_triplet = @target@ + subdir = src/backends/hosts + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -69,27 +65,29 @@ LTLIBRARIES = $(backend_LTLIBRARIES) + libelektra_hosts_la_DEPENDENCIES = ../../libelektra/libelektra.la + am_libelektra_hosts_la_OBJECTS = libelektra_hosts_la-hosts.lo + libelektra_hosts_la_OBJECTS = $(am_libelektra_hosts_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_hosts_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_hosts_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_hosts_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_hosts_a_SOURCES) $(libelektra_hosts_la_SOURCES) + DIST_SOURCES = $(libelektra_hosts_a_SOURCES) \ + $(libelektra_hosts_la_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -115,8 +113,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -127,20 +123,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -162,6 +149,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -177,25 +165,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -209,6 +193,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -219,7 +204,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -235,6 +219,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -248,6 +234,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -255,6 +242,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -308,21 +297,21 @@ libelektra-hosts.a: $(libelektra_hosts_a + $(RANLIB) libelektra-hosts.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -334,7 +323,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-hosts.la: $(libelektra_hosts_la_OBJECTS) $(libelektra_hosts_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_hosts_la_LDFLAGS) $(libelektra_hosts_la_OBJECTS) $(libelektra_hosts_la_LIBADD) $(LIBS) ++ $(libelektra_hosts_la_LINK) -rpath $(backenddir) $(libelektra_hosts_la_OBJECTS) $(libelektra_hosts_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -346,46 +335,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_hosts_la-hosts.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_hosts_a-hosts.o: hosts.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_a_CFLAGS) $(CFLAGS) -MT libelektra_hosts_a-hosts.o -MD -MP -MF "$(DEPDIR)/libelektra_hosts_a-hosts.Tpo" -c -o libelektra_hosts_a-hosts.o `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_hosts_a-hosts.Tpo" "$(DEPDIR)/libelektra_hosts_a-hosts.Po"; else rm -f "$(DEPDIR)/libelektra_hosts_a-hosts.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_a_CFLAGS) $(CFLAGS) -MT libelektra_hosts_a-hosts.o -MD -MP -MF $(DEPDIR)/libelektra_hosts_a-hosts.Tpo -c -o libelektra_hosts_a-hosts.o `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_hosts_a-hosts.Tpo $(DEPDIR)/libelektra_hosts_a-hosts.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosts.c' object='libelektra_hosts_a-hosts.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_a_CFLAGS) $(CFLAGS) -c -o libelektra_hosts_a-hosts.o `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c + + libelektra_hosts_a-hosts.obj: hosts.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_a_CFLAGS) $(CFLAGS) -MT libelektra_hosts_a-hosts.obj -MD -MP -MF "$(DEPDIR)/libelektra_hosts_a-hosts.Tpo" -c -o libelektra_hosts_a-hosts.obj `if test -f 'hosts.c'; then $(CYGPATH_W) 'hosts.c'; else $(CYGPATH_W) '$(srcdir)/hosts.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_hosts_a-hosts.Tpo" "$(DEPDIR)/libelektra_hosts_a-hosts.Po"; else rm -f "$(DEPDIR)/libelektra_hosts_a-hosts.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_a_CFLAGS) $(CFLAGS) -MT libelektra_hosts_a-hosts.obj -MD -MP -MF $(DEPDIR)/libelektra_hosts_a-hosts.Tpo -c -o libelektra_hosts_a-hosts.obj `if test -f 'hosts.c'; then $(CYGPATH_W) 'hosts.c'; else $(CYGPATH_W) '$(srcdir)/hosts.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_hosts_a-hosts.Tpo $(DEPDIR)/libelektra_hosts_a-hosts.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosts.c' object='libelektra_hosts_a-hosts.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_a_CFLAGS) $(CFLAGS) -c -o libelektra_hosts_a-hosts.obj `if test -f 'hosts.c'; then $(CYGPATH_W) 'hosts.c'; else $(CYGPATH_W) '$(srcdir)/hosts.c'; fi` + + libelektra_hosts_la-hosts.lo: hosts.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_la_CFLAGS) $(CFLAGS) -MT libelektra_hosts_la-hosts.lo -MD -MP -MF "$(DEPDIR)/libelektra_hosts_la-hosts.Tpo" -c -o libelektra_hosts_la-hosts.lo `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_hosts_la-hosts.Tpo" "$(DEPDIR)/libelektra_hosts_la-hosts.Plo"; else rm -f "$(DEPDIR)/libelektra_hosts_la-hosts.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_la_CFLAGS) $(CFLAGS) -MT libelektra_hosts_la-hosts.lo -MD -MP -MF $(DEPDIR)/libelektra_hosts_la-hosts.Tpo -c -o libelektra_hosts_la-hosts.lo `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_hosts_la-hosts.Tpo $(DEPDIR)/libelektra_hosts_la-hosts.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hosts.c' object='libelektra_hosts_la-hosts.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_la_CFLAGS) $(CFLAGS) -c -o libelektra_hosts_la-hosts.lo `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_hosts_la_CFLAGS) $(CFLAGS) -c -o libelektra_hosts_la-hosts.lo `test -f 'hosts.c' || echo '$(srcdir)/'`hosts.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -393,17 +382,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -415,8 +400,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -426,13 +411,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -446,22 +430,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -477,7 +460,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -512,7 +495,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -526,12 +509,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -552,7 +543,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -560,13 +553,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-backendLTLIBRARIES \ +- uninstall-info-am ++ tags uninstall uninstall-am uninstall-backendLTLIBRARIES + + + clean-local: +Index: elektra-0.7.0rc5/src/backends/ini/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/ini/Makefile.in ++++ elektra-0.7.0rc5/src/backends/ini/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,13 +17,10 @@ + # $Id$ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ target_triplet = @target@ + subdir = src/backends/ini + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -72,27 +68,29 @@ am__objects_2 = libelektra_ini_la-ini.lo + libelektra_ini_la-parser.lo + am_libelektra_ini_la_OBJECTS = $(am__objects_2) + libelektra_ini_la_OBJECTS = $(am_libelektra_ini_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_ini_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_ini_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_ini_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_ini_a_SOURCES) $(libelektra_ini_la_SOURCES) + DIST_SOURCES = $(libelektra_ini_a_SOURCES) \ + $(libelektra_ini_la_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,8 +116,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -130,20 +126,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -165,6 +152,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -180,25 +168,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -212,6 +196,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -222,7 +207,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -238,6 +222,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -251,6 +237,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -258,6 +245,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + +@@ -314,21 +303,21 @@ libelektra-ini.a: $(libelektra_ini_a_OBJ + $(RANLIB) libelektra-ini.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -340,7 +329,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-ini.la: $(libelektra_ini_la_OBJECTS) $(libelektra_ini_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_ini_la_LDFLAGS) $(libelektra_ini_la_OBJECTS) $(libelektra_ini_la_LIBADD) $(LIBS) ++ $(libelektra_ini_la_LINK) -rpath $(backenddir) $(libelektra_ini_la_OBJECTS) $(libelektra_ini_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -356,88 +345,88 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_ini_la-parser.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_ini_a-ini.o: ini.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-ini.o -MD -MP -MF "$(DEPDIR)/libelektra_ini_a-ini.Tpo" -c -o libelektra_ini_a-ini.o `test -f 'ini.c' || echo '$(srcdir)/'`ini.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_a-ini.Tpo" "$(DEPDIR)/libelektra_ini_a-ini.Po"; else rm -f "$(DEPDIR)/libelektra_ini_a-ini.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-ini.o -MD -MP -MF $(DEPDIR)/libelektra_ini_a-ini.Tpo -c -o libelektra_ini_a-ini.o `test -f 'ini.c' || echo '$(srcdir)/'`ini.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_a-ini.Tpo $(DEPDIR)/libelektra_ini_a-ini.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ini.c' object='libelektra_ini_a-ini.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -c -o libelektra_ini_a-ini.o `test -f 'ini.c' || echo '$(srcdir)/'`ini.c + + libelektra_ini_a-ini.obj: ini.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-ini.obj -MD -MP -MF "$(DEPDIR)/libelektra_ini_a-ini.Tpo" -c -o libelektra_ini_a-ini.obj `if test -f 'ini.c'; then $(CYGPATH_W) 'ini.c'; else $(CYGPATH_W) '$(srcdir)/ini.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_a-ini.Tpo" "$(DEPDIR)/libelektra_ini_a-ini.Po"; else rm -f "$(DEPDIR)/libelektra_ini_a-ini.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-ini.obj -MD -MP -MF $(DEPDIR)/libelektra_ini_a-ini.Tpo -c -o libelektra_ini_a-ini.obj `if test -f 'ini.c'; then $(CYGPATH_W) 'ini.c'; else $(CYGPATH_W) '$(srcdir)/ini.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_a-ini.Tpo $(DEPDIR)/libelektra_ini_a-ini.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ini.c' object='libelektra_ini_a-ini.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -c -o libelektra_ini_a-ini.obj `if test -f 'ini.c'; then $(CYGPATH_W) 'ini.c'; else $(CYGPATH_W) '$(srcdir)/ini.c'; fi` + + libelektra_ini_a-helpers.o: helpers.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-helpers.o -MD -MP -MF "$(DEPDIR)/libelektra_ini_a-helpers.Tpo" -c -o libelektra_ini_a-helpers.o `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_a-helpers.Tpo" "$(DEPDIR)/libelektra_ini_a-helpers.Po"; else rm -f "$(DEPDIR)/libelektra_ini_a-helpers.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-helpers.o -MD -MP -MF $(DEPDIR)/libelektra_ini_a-helpers.Tpo -c -o libelektra_ini_a-helpers.o `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_a-helpers.Tpo $(DEPDIR)/libelektra_ini_a-helpers.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='helpers.c' object='libelektra_ini_a-helpers.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -c -o libelektra_ini_a-helpers.o `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c + + libelektra_ini_a-helpers.obj: helpers.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-helpers.obj -MD -MP -MF "$(DEPDIR)/libelektra_ini_a-helpers.Tpo" -c -o libelektra_ini_a-helpers.obj `if test -f 'helpers.c'; then $(CYGPATH_W) 'helpers.c'; else $(CYGPATH_W) '$(srcdir)/helpers.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_a-helpers.Tpo" "$(DEPDIR)/libelektra_ini_a-helpers.Po"; else rm -f "$(DEPDIR)/libelektra_ini_a-helpers.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-helpers.obj -MD -MP -MF $(DEPDIR)/libelektra_ini_a-helpers.Tpo -c -o libelektra_ini_a-helpers.obj `if test -f 'helpers.c'; then $(CYGPATH_W) 'helpers.c'; else $(CYGPATH_W) '$(srcdir)/helpers.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_a-helpers.Tpo $(DEPDIR)/libelektra_ini_a-helpers.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='helpers.c' object='libelektra_ini_a-helpers.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -c -o libelektra_ini_a-helpers.obj `if test -f 'helpers.c'; then $(CYGPATH_W) 'helpers.c'; else $(CYGPATH_W) '$(srcdir)/helpers.c'; fi` + + libelektra_ini_a-parser.o: parser.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-parser.o -MD -MP -MF "$(DEPDIR)/libelektra_ini_a-parser.Tpo" -c -o libelektra_ini_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_a-parser.Tpo" "$(DEPDIR)/libelektra_ini_a-parser.Po"; else rm -f "$(DEPDIR)/libelektra_ini_a-parser.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-parser.o -MD -MP -MF $(DEPDIR)/libelektra_ini_a-parser.Tpo -c -o libelektra_ini_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_a-parser.Tpo $(DEPDIR)/libelektra_ini_a-parser.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parser.c' object='libelektra_ini_a-parser.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -c -o libelektra_ini_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c + + libelektra_ini_a-parser.obj: parser.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-parser.obj -MD -MP -MF "$(DEPDIR)/libelektra_ini_a-parser.Tpo" -c -o libelektra_ini_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_a-parser.Tpo" "$(DEPDIR)/libelektra_ini_a-parser.Po"; else rm -f "$(DEPDIR)/libelektra_ini_a-parser.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -MT libelektra_ini_a-parser.obj -MD -MP -MF $(DEPDIR)/libelektra_ini_a-parser.Tpo -c -o libelektra_ini_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_a-parser.Tpo $(DEPDIR)/libelektra_ini_a-parser.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parser.c' object='libelektra_ini_a-parser.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_a_CFLAGS) $(CFLAGS) -c -o libelektra_ini_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi` + + libelektra_ini_la-ini.lo: ini.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -MT libelektra_ini_la-ini.lo -MD -MP -MF "$(DEPDIR)/libelektra_ini_la-ini.Tpo" -c -o libelektra_ini_la-ini.lo `test -f 'ini.c' || echo '$(srcdir)/'`ini.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_la-ini.Tpo" "$(DEPDIR)/libelektra_ini_la-ini.Plo"; else rm -f "$(DEPDIR)/libelektra_ini_la-ini.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -MT libelektra_ini_la-ini.lo -MD -MP -MF $(DEPDIR)/libelektra_ini_la-ini.Tpo -c -o libelektra_ini_la-ini.lo `test -f 'ini.c' || echo '$(srcdir)/'`ini.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_la-ini.Tpo $(DEPDIR)/libelektra_ini_la-ini.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ini.c' object='libelektra_ini_la-ini.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -c -o libelektra_ini_la-ini.lo `test -f 'ini.c' || echo '$(srcdir)/'`ini.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -c -o libelektra_ini_la-ini.lo `test -f 'ini.c' || echo '$(srcdir)/'`ini.c + + libelektra_ini_la-helpers.lo: helpers.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -MT libelektra_ini_la-helpers.lo -MD -MP -MF "$(DEPDIR)/libelektra_ini_la-helpers.Tpo" -c -o libelektra_ini_la-helpers.lo `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_la-helpers.Tpo" "$(DEPDIR)/libelektra_ini_la-helpers.Plo"; else rm -f "$(DEPDIR)/libelektra_ini_la-helpers.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -MT libelektra_ini_la-helpers.lo -MD -MP -MF $(DEPDIR)/libelektra_ini_la-helpers.Tpo -c -o libelektra_ini_la-helpers.lo `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_la-helpers.Tpo $(DEPDIR)/libelektra_ini_la-helpers.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='helpers.c' object='libelektra_ini_la-helpers.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -c -o libelektra_ini_la-helpers.lo `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -c -o libelektra_ini_la-helpers.lo `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c + + libelektra_ini_la-parser.lo: parser.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -MT libelektra_ini_la-parser.lo -MD -MP -MF "$(DEPDIR)/libelektra_ini_la-parser.Tpo" -c -o libelektra_ini_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_ini_la-parser.Tpo" "$(DEPDIR)/libelektra_ini_la-parser.Plo"; else rm -f "$(DEPDIR)/libelektra_ini_la-parser.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -MT libelektra_ini_la-parser.lo -MD -MP -MF $(DEPDIR)/libelektra_ini_la-parser.Tpo -c -o libelektra_ini_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_ini_la-parser.Tpo $(DEPDIR)/libelektra_ini_la-parser.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parser.c' object='libelektra_ini_la-parser.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -c -o libelektra_ini_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_ini_la_CFLAGS) $(CFLAGS) -c -o libelektra_ini_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -445,17 +434,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -467,8 +452,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -478,13 +463,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -498,22 +482,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -529,7 +512,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -564,7 +547,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -578,12 +561,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -604,7 +595,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -612,12 +605,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-backendLTLIBRARIES install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-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-backendLTLIBRARIES uninstall-info-am ++ uninstall-am uninstall-backendLTLIBRARIES + + + ../../libelektra/libelektra.la: +Index: elektra-0.7.0rc5/src/backends/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/Makefile.in ++++ elektra-0.7.0rc5/src/backends/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,13 +13,10 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -38,8 +35,7 @@ target_triplet = @target@ + subdir = src/backends + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -49,17 +45,17 @@ SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -85,8 +81,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -97,20 +91,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -132,6 +117,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -147,25 +133,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -179,6 +161,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -189,7 +172,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -205,6 +187,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -218,6 +202,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -225,6 +210,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + DIST_SUBDIRS = filesys berkeleydb daemon fstab passwd hosts gconf ini template +@@ -269,10 +256,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -304,8 +287,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -349,8 +331,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -375,8 +357,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -386,13 +368,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -406,23 +387,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/doc +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -436,7 +415,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -444,6 +423,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -483,8 +464,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -498,14 +478,22 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -524,25 +512,26 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-exec-am install-strip uninstall-am + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean 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-exec install-exec-am install-exec-hook \ +- install-info install-info-am install-man install-strip \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-exec-hook 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 installdirs-am \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-hook \ +- uninstall-info-am ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-hook + + + install-exec-hook: +Index: elektra-0.7.0rc5/src/backends/passwd/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/passwd/Makefile.in ++++ elektra-0.7.0rc5/src/backends/passwd/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,13 +17,10 @@ + #elekpasswddir = $(develdocdir)/backend-passwd/ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ target_triplet = @target@ + subdir = src/backends/passwd + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -67,17 +63,22 @@ LTLIBRARIES = $(backend_LTLIBRARIES) + libelektra_passwd_la_DEPENDENCIES = ../../libelektra/libelektra.la + am_libelektra_passwd_la_OBJECTS = libelektra_passwd_la-passwd.lo + libelektra_passwd_la_OBJECTS = $(am_libelektra_passwd_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_passwd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_passwd_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_passwd_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_passwd_a_SOURCES) \ + $(libelektra_passwd_la_SOURCES) + DIST_SOURCES = $(libelektra_passwd_a_SOURCES) \ +@@ -85,10 +86,7 @@ DIST_SOURCES = $(libelektra_passwd_a_SOU + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -114,8 +112,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -126,20 +122,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -161,6 +148,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -176,25 +164,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -208,6 +192,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -218,7 +203,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -234,6 +218,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -247,6 +233,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -254,6 +241,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -307,21 +296,21 @@ libelektra-passwd.a: $(libelektra_passwd + $(RANLIB) libelektra-passwd.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -333,7 +322,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-passwd.la: $(libelektra_passwd_la_OBJECTS) $(libelektra_passwd_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_passwd_la_LDFLAGS) $(libelektra_passwd_la_OBJECTS) $(libelektra_passwd_la_LIBADD) $(LIBS) ++ $(libelektra_passwd_la_LINK) -rpath $(backenddir) $(libelektra_passwd_la_OBJECTS) $(libelektra_passwd_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -345,46 +334,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_passwd_la-passwd.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_passwd_a-passwd.o: passwd.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_a_CFLAGS) $(CFLAGS) -MT libelektra_passwd_a-passwd.o -MD -MP -MF "$(DEPDIR)/libelektra_passwd_a-passwd.Tpo" -c -o libelektra_passwd_a-passwd.o `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_passwd_a-passwd.Tpo" "$(DEPDIR)/libelektra_passwd_a-passwd.Po"; else rm -f "$(DEPDIR)/libelektra_passwd_a-passwd.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_a_CFLAGS) $(CFLAGS) -MT libelektra_passwd_a-passwd.o -MD -MP -MF $(DEPDIR)/libelektra_passwd_a-passwd.Tpo -c -o libelektra_passwd_a-passwd.o `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_passwd_a-passwd.Tpo $(DEPDIR)/libelektra_passwd_a-passwd.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passwd.c' object='libelektra_passwd_a-passwd.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_a_CFLAGS) $(CFLAGS) -c -o libelektra_passwd_a-passwd.o `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c + + libelektra_passwd_a-passwd.obj: passwd.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_a_CFLAGS) $(CFLAGS) -MT libelektra_passwd_a-passwd.obj -MD -MP -MF "$(DEPDIR)/libelektra_passwd_a-passwd.Tpo" -c -o libelektra_passwd_a-passwd.obj `if test -f 'passwd.c'; then $(CYGPATH_W) 'passwd.c'; else $(CYGPATH_W) '$(srcdir)/passwd.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_passwd_a-passwd.Tpo" "$(DEPDIR)/libelektra_passwd_a-passwd.Po"; else rm -f "$(DEPDIR)/libelektra_passwd_a-passwd.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_a_CFLAGS) $(CFLAGS) -MT libelektra_passwd_a-passwd.obj -MD -MP -MF $(DEPDIR)/libelektra_passwd_a-passwd.Tpo -c -o libelektra_passwd_a-passwd.obj `if test -f 'passwd.c'; then $(CYGPATH_W) 'passwd.c'; else $(CYGPATH_W) '$(srcdir)/passwd.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_passwd_a-passwd.Tpo $(DEPDIR)/libelektra_passwd_a-passwd.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passwd.c' object='libelektra_passwd_a-passwd.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_a_CFLAGS) $(CFLAGS) -c -o libelektra_passwd_a-passwd.obj `if test -f 'passwd.c'; then $(CYGPATH_W) 'passwd.c'; else $(CYGPATH_W) '$(srcdir)/passwd.c'; fi` + + libelektra_passwd_la-passwd.lo: passwd.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_la_CFLAGS) $(CFLAGS) -MT libelektra_passwd_la-passwd.lo -MD -MP -MF "$(DEPDIR)/libelektra_passwd_la-passwd.Tpo" -c -o libelektra_passwd_la-passwd.lo `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_passwd_la-passwd.Tpo" "$(DEPDIR)/libelektra_passwd_la-passwd.Plo"; else rm -f "$(DEPDIR)/libelektra_passwd_la-passwd.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_la_CFLAGS) $(CFLAGS) -MT libelektra_passwd_la-passwd.lo -MD -MP -MF $(DEPDIR)/libelektra_passwd_la-passwd.Tpo -c -o libelektra_passwd_la-passwd.lo `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_passwd_la-passwd.Tpo $(DEPDIR)/libelektra_passwd_la-passwd.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passwd.c' object='libelektra_passwd_la-passwd.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_la_CFLAGS) $(CFLAGS) -c -o libelektra_passwd_la-passwd.lo `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_passwd_la_CFLAGS) $(CFLAGS) -c -o libelektra_passwd_la-passwd.lo `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -392,17 +381,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -414,8 +399,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -425,13 +410,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -445,22 +429,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -476,7 +459,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -511,7 +494,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -525,12 +508,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -551,7 +542,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -559,13 +552,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-backendLTLIBRARIES \ +- uninstall-info-am ++ tags uninstall uninstall-am uninstall-backendLTLIBRARIES + + + clean-local: +Index: elektra-0.7.0rc5/src/backends/template/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/backends/template/Makefile.in ++++ elektra-0.7.0rc5/src/backends/template/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -19,13 +19,10 @@ + #EXTRA_DIST = template.c README + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,8 +41,7 @@ target_triplet = @target@ + subdir = src/backends/template + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -71,17 +67,22 @@ libelektra_template_la_DEPENDENCIES = .. + am__objects_2 = libelektra_template_la-template.lo + am_libelektra_template_la_OBJECTS = $(am__objects_2) + libelektra_template_la_OBJECTS = $(am_libelektra_template_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_template_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektra_template_la_CFLAGS) $(CFLAGS) \ ++ $(libelektra_template_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_template_a_SOURCES) \ + $(libelektra_template_la_SOURCES) + DIST_SOURCES = $(libelektra_template_a_SOURCES) \ +@@ -89,10 +90,7 @@ DIST_SOURCES = $(libelektra_template_a_S + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,8 +116,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -130,20 +126,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -165,6 +152,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -180,25 +168,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -212,6 +196,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -222,7 +207,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -238,6 +222,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -251,6 +237,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -258,6 +245,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -312,21 +301,21 @@ libelektra-template.a: $(libelektra_temp + $(RANLIB) libelektra-template.a + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(backenddir)" || $(mkdir_p) "$(DESTDIR)$(backenddir)" ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: +@@ -338,7 +327,7 @@ clean-backendLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-template.la: $(libelektra_template_la_OBJECTS) $(libelektra_template_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libelektra_template_la_LDFLAGS) $(libelektra_template_la_OBJECTS) $(libelektra_template_la_LIBADD) $(LIBS) ++ $(libelektra_template_la_LINK) -rpath $(backenddir) $(libelektra_template_la_OBJECTS) $(libelektra_template_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -350,46 +339,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_template_la-template.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_template_a-template.o: template.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_a_CFLAGS) $(CFLAGS) -MT libelektra_template_a-template.o -MD -MP -MF "$(DEPDIR)/libelektra_template_a-template.Tpo" -c -o libelektra_template_a-template.o `test -f 'template.c' || echo '$(srcdir)/'`template.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_template_a-template.Tpo" "$(DEPDIR)/libelektra_template_a-template.Po"; else rm -f "$(DEPDIR)/libelektra_template_a-template.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_a_CFLAGS) $(CFLAGS) -MT libelektra_template_a-template.o -MD -MP -MF $(DEPDIR)/libelektra_template_a-template.Tpo -c -o libelektra_template_a-template.o `test -f 'template.c' || echo '$(srcdir)/'`template.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_template_a-template.Tpo $(DEPDIR)/libelektra_template_a-template.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='template.c' object='libelektra_template_a-template.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_a_CFLAGS) $(CFLAGS) -c -o libelektra_template_a-template.o `test -f 'template.c' || echo '$(srcdir)/'`template.c + + libelektra_template_a-template.obj: template.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_a_CFLAGS) $(CFLAGS) -MT libelektra_template_a-template.obj -MD -MP -MF "$(DEPDIR)/libelektra_template_a-template.Tpo" -c -o libelektra_template_a-template.obj `if test -f 'template.c'; then $(CYGPATH_W) 'template.c'; else $(CYGPATH_W) '$(srcdir)/template.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_template_a-template.Tpo" "$(DEPDIR)/libelektra_template_a-template.Po"; else rm -f "$(DEPDIR)/libelektra_template_a-template.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_a_CFLAGS) $(CFLAGS) -MT libelektra_template_a-template.obj -MD -MP -MF $(DEPDIR)/libelektra_template_a-template.Tpo -c -o libelektra_template_a-template.obj `if test -f 'template.c'; then $(CYGPATH_W) 'template.c'; else $(CYGPATH_W) '$(srcdir)/template.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_template_a-template.Tpo $(DEPDIR)/libelektra_template_a-template.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='template.c' object='libelektra_template_a-template.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_a_CFLAGS) $(CFLAGS) -c -o libelektra_template_a-template.obj `if test -f 'template.c'; then $(CYGPATH_W) 'template.c'; else $(CYGPATH_W) '$(srcdir)/template.c'; fi` + + libelektra_template_la-template.lo: template.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_la_CFLAGS) $(CFLAGS) -MT libelektra_template_la-template.lo -MD -MP -MF "$(DEPDIR)/libelektra_template_la-template.Tpo" -c -o libelektra_template_la-template.lo `test -f 'template.c' || echo '$(srcdir)/'`template.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_template_la-template.Tpo" "$(DEPDIR)/libelektra_template_la-template.Plo"; else rm -f "$(DEPDIR)/libelektra_template_la-template.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_la_CFLAGS) $(CFLAGS) -MT libelektra_template_la-template.lo -MD -MP -MF $(DEPDIR)/libelektra_template_la-template.Tpo -c -o libelektra_template_la-template.lo `test -f 'template.c' || echo '$(srcdir)/'`template.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_template_la-template.Tpo $(DEPDIR)/libelektra_template_la-template.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='template.c' object='libelektra_template_la-template.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_la_CFLAGS) $(CFLAGS) -c -o libelektra_template_la-template.lo `test -f 'template.c' || echo '$(srcdir)/'`template.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_template_la_CFLAGS) $(CFLAGS) -c -o libelektra_template_la-template.lo `test -f 'template.c' || echo '$(srcdir)/'`template.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -397,17 +386,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -419,8 +404,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -430,13 +415,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -450,22 +434,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -481,7 +464,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(backenddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -516,7 +499,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -530,12 +513,20 @@ info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -556,7 +547,9 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool \ +@@ -564,12 +557,14 @@ uninstall-am: uninstall-backendLTLIBRARI + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-backendLTLIBRARIES install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-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-backendLTLIBRARIES uninstall-info-am ++ uninstall-am uninstall-backendLTLIBRARIES + + + ../../libelektra/libelektra.la: +Index: elektra-0.7.0rc5/src/bindings/cpp/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/bindings/cpp/Makefile.in ++++ elektra-0.7.0rc5/src/bindings/cpp/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,13 +16,10 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ subdir = src/bindings/cpp + DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -72,35 +68,40 @@ am__objects_2 = libelektra_cpp_la-kdb.lo + libelektra_cpp_la-keyset.lo + am_libelektra_cpp_la_OBJECTS = $(am__objects_2) + libelektra_cpp_la_OBJECTS = $(am_libelektra_cpp_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_cpp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ ++ $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) \ ++ $(libelektra_cpp_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_cpp_a_SOURCES) $(libelektra_cpp_la_SOURCES) + DIST_SOURCES = $(libelektra_cpp_a_SOURCES) \ + $(libelektra_cpp_la_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + includeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(include_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -126,8 +127,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -138,20 +137,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -173,6 +163,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -188,25 +179,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -220,6 +207,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -230,7 +218,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -246,6 +233,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -259,6 +248,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -266,6 +256,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + cppflags = -I$(top_srcdir)/src/include -I$(srcdir)/include +@@ -326,7 +318,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLIBRARIES: $(lib_LIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -359,21 +351,21 @@ libelektra-cpp.a: $(libelektra_cpp_a_OBJ + $(RANLIB) libelektra-cpp.a + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: +@@ -385,7 +377,7 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra-cpp.la: $(libelektra_cpp_la_OBJECTS) $(libelektra_cpp_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(libdir) $(libelektra_cpp_la_LDFLAGS) $(libelektra_cpp_la_OBJECTS) $(libelektra_cpp_la_LIBADD) $(LIBS) ++ $(libelektra_cpp_la_LINK) -rpath $(libdir) $(libelektra_cpp_la_OBJECTS) $(libelektra_cpp_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -401,101 +393,97 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_cpp_la-keyset.Plo@am__quote@ + + .cpp.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + + .cpp.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .cpp.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + + libelektra_cpp_a-kdb.o: kdb.cpp +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-kdb.o -MD -MP -MF "$(DEPDIR)/libelektra_cpp_a-kdb.Tpo" -c -o libelektra_cpp_a-kdb.o `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_a-kdb.Tpo" "$(DEPDIR)/libelektra_cpp_a-kdb.Po"; else rm -f "$(DEPDIR)/libelektra_cpp_a-kdb.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-kdb.o -MD -MP -MF $(DEPDIR)/libelektra_cpp_a-kdb.Tpo -c -o libelektra_cpp_a-kdb.o `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_a-kdb.Tpo $(DEPDIR)/libelektra_cpp_a-kdb.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='kdb.cpp' object='libelektra_cpp_a-kdb.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_a-kdb.o `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp + + libelektra_cpp_a-kdb.obj: kdb.cpp +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-kdb.obj -MD -MP -MF "$(DEPDIR)/libelektra_cpp_a-kdb.Tpo" -c -o libelektra_cpp_a-kdb.obj `if test -f 'kdb.cpp'; then $(CYGPATH_W) 'kdb.cpp'; else $(CYGPATH_W) '$(srcdir)/kdb.cpp'; fi`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_a-kdb.Tpo" "$(DEPDIR)/libelektra_cpp_a-kdb.Po"; else rm -f "$(DEPDIR)/libelektra_cpp_a-kdb.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-kdb.obj -MD -MP -MF $(DEPDIR)/libelektra_cpp_a-kdb.Tpo -c -o libelektra_cpp_a-kdb.obj `if test -f 'kdb.cpp'; then $(CYGPATH_W) 'kdb.cpp'; else $(CYGPATH_W) '$(srcdir)/kdb.cpp'; fi` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_a-kdb.Tpo $(DEPDIR)/libelektra_cpp_a-kdb.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='kdb.cpp' object='libelektra_cpp_a-kdb.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_a-kdb.obj `if test -f 'kdb.cpp'; then $(CYGPATH_W) 'kdb.cpp'; else $(CYGPATH_W) '$(srcdir)/kdb.cpp'; fi` + + libelektra_cpp_a-key.o: key.cpp +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-key.o -MD -MP -MF "$(DEPDIR)/libelektra_cpp_a-key.Tpo" -c -o libelektra_cpp_a-key.o `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_a-key.Tpo" "$(DEPDIR)/libelektra_cpp_a-key.Po"; else rm -f "$(DEPDIR)/libelektra_cpp_a-key.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-key.o -MD -MP -MF $(DEPDIR)/libelektra_cpp_a-key.Tpo -c -o libelektra_cpp_a-key.o `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_a-key.Tpo $(DEPDIR)/libelektra_cpp_a-key.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='key.cpp' object='libelektra_cpp_a-key.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_a-key.o `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp + + libelektra_cpp_a-key.obj: key.cpp +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-key.obj -MD -MP -MF "$(DEPDIR)/libelektra_cpp_a-key.Tpo" -c -o libelektra_cpp_a-key.obj `if test -f 'key.cpp'; then $(CYGPATH_W) 'key.cpp'; else $(CYGPATH_W) '$(srcdir)/key.cpp'; fi`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_a-key.Tpo" "$(DEPDIR)/libelektra_cpp_a-key.Po"; else rm -f "$(DEPDIR)/libelektra_cpp_a-key.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-key.obj -MD -MP -MF $(DEPDIR)/libelektra_cpp_a-key.Tpo -c -o libelektra_cpp_a-key.obj `if test -f 'key.cpp'; then $(CYGPATH_W) 'key.cpp'; else $(CYGPATH_W) '$(srcdir)/key.cpp'; fi` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_a-key.Tpo $(DEPDIR)/libelektra_cpp_a-key.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='key.cpp' object='libelektra_cpp_a-key.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_a-key.obj `if test -f 'key.cpp'; then $(CYGPATH_W) 'key.cpp'; else $(CYGPATH_W) '$(srcdir)/key.cpp'; fi` + + libelektra_cpp_a-keyset.o: keyset.cpp +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-keyset.o -MD -MP -MF "$(DEPDIR)/libelektra_cpp_a-keyset.Tpo" -c -o libelektra_cpp_a-keyset.o `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_a-keyset.Tpo" "$(DEPDIR)/libelektra_cpp_a-keyset.Po"; else rm -f "$(DEPDIR)/libelektra_cpp_a-keyset.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-keyset.o -MD -MP -MF $(DEPDIR)/libelektra_cpp_a-keyset.Tpo -c -o libelektra_cpp_a-keyset.o `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_a-keyset.Tpo $(DEPDIR)/libelektra_cpp_a-keyset.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='keyset.cpp' object='libelektra_cpp_a-keyset.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_a-keyset.o `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp + + libelektra_cpp_a-keyset.obj: keyset.cpp +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-keyset.obj -MD -MP -MF "$(DEPDIR)/libelektra_cpp_a-keyset.Tpo" -c -o libelektra_cpp_a-keyset.obj `if test -f 'keyset.cpp'; then $(CYGPATH_W) 'keyset.cpp'; else $(CYGPATH_W) '$(srcdir)/keyset.cpp'; fi`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_a-keyset.Tpo" "$(DEPDIR)/libelektra_cpp_a-keyset.Po"; else rm -f "$(DEPDIR)/libelektra_cpp_a-keyset.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_a-keyset.obj -MD -MP -MF $(DEPDIR)/libelektra_cpp_a-keyset.Tpo -c -o libelektra_cpp_a-keyset.obj `if test -f 'keyset.cpp'; then $(CYGPATH_W) 'keyset.cpp'; else $(CYGPATH_W) '$(srcdir)/keyset.cpp'; fi` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_a-keyset.Tpo $(DEPDIR)/libelektra_cpp_a-keyset.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='keyset.cpp' object='libelektra_cpp_a-keyset.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_a_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_a_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_a-keyset.obj `if test -f 'keyset.cpp'; then $(CYGPATH_W) 'keyset.cpp'; else $(CYGPATH_W) '$(srcdir)/keyset.cpp'; fi` + + libelektra_cpp_la-kdb.lo: kdb.cpp +-@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_la-kdb.lo -MD -MP -MF "$(DEPDIR)/libelektra_cpp_la-kdb.Tpo" -c -o libelektra_cpp_la-kdb.lo `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_la-kdb.Tpo" "$(DEPDIR)/libelektra_cpp_la-kdb.Plo"; else rm -f "$(DEPDIR)/libelektra_cpp_la-kdb.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_la-kdb.lo -MD -MP -MF $(DEPDIR)/libelektra_cpp_la-kdb.Tpo -c -o libelektra_cpp_la-kdb.lo `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_la-kdb.Tpo $(DEPDIR)/libelektra_cpp_la-kdb.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='kdb.cpp' object='libelektra_cpp_la-kdb.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_la-kdb.lo `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_la-kdb.lo `test -f 'kdb.cpp' || echo '$(srcdir)/'`kdb.cpp + + libelektra_cpp_la-key.lo: key.cpp +-@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_la-key.lo -MD -MP -MF "$(DEPDIR)/libelektra_cpp_la-key.Tpo" -c -o libelektra_cpp_la-key.lo `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_la-key.Tpo" "$(DEPDIR)/libelektra_cpp_la-key.Plo"; else rm -f "$(DEPDIR)/libelektra_cpp_la-key.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_la-key.lo -MD -MP -MF $(DEPDIR)/libelektra_cpp_la-key.Tpo -c -o libelektra_cpp_la-key.lo `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_la-key.Tpo $(DEPDIR)/libelektra_cpp_la-key.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='key.cpp' object='libelektra_cpp_la-key.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_la-key.lo `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_la-key.lo `test -f 'key.cpp' || echo '$(srcdir)/'`key.cpp + + libelektra_cpp_la-keyset.lo: keyset.cpp +-@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_la-keyset.lo -MD -MP -MF "$(DEPDIR)/libelektra_cpp_la-keyset.Tpo" -c -o libelektra_cpp_la-keyset.lo `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libelektra_cpp_la-keyset.Tpo" "$(DEPDIR)/libelektra_cpp_la-keyset.Plo"; else rm -f "$(DEPDIR)/libelektra_cpp_la-keyset.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -MT libelektra_cpp_la-keyset.lo -MD -MP -MF $(DEPDIR)/libelektra_cpp_la-keyset.Tpo -c -o libelektra_cpp_la-keyset.lo `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libelektra_cpp_la-keyset.Tpo $(DEPDIR)/libelektra_cpp_la-keyset.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='keyset.cpp' object='libelektra_cpp_la-keyset.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_la-keyset.lo `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libelektra_cpp_la_CPPFLAGS) $(CPPFLAGS) $(libelektra_cpp_la_CXXFLAGS) $(CXXFLAGS) -c -o libelektra_cpp_la-keyset.lo `test -f 'keyset.cpp' || echo '$(srcdir)/'`keyset.cpp + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" ++ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -542,8 +530,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -587,8 +574,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -613,8 +600,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -624,13 +611,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -644,23 +630,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/include +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -674,7 +658,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -682,6 +666,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -693,7 +679,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive +@@ -730,7 +716,7 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + +@@ -744,12 +730,20 @@ info-am: + + install-data-am: install-includeHEADERS + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-libLIBRARIES install-libLTLIBRARIES + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -770,26 +764,28 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-includeHEADERS uninstall-info-am \ +- uninstall-libLIBRARIES uninstall-libLTLIBRARIES ++uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES \ ++ uninstall-libLTLIBRARIES + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \ +- clean-libtool clean-local clean-recursive ctags \ +- ctags-recursive distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic \ ++ clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \ ++ clean-local ctags ctags-recursive 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-includeHEADERS install-info install-info-am \ + install-libLIBRARIES install-libLTLIBRARIES install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-includeHEADERS uninstall-info-am \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-includeHEADERS \ + uninstall-libLIBRARIES uninstall-libLTLIBRARIES + + +Index: elektra-0.7.0rc5/src/bindings/cpp/tests/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/bindings/cpp/tests/Makefile.in ++++ elektra-0.7.0rc5/src/bindings/cpp/tests/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,13 +13,10 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -35,12 +32,12 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++TESTS = test_key$(EXEEXT) test_ks$(EXEEXT) test_kdb$(EXEEXT) + check_PROGRAMS = test_key$(EXEEXT) test_ks$(EXEEXT) test_kdb$(EXEEXT) + subdir = src/bindings/cpp/tests + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -59,35 +56,34 @@ am_test_ks_OBJECTS = test_ks.$(OBJEXT) t + test_ks_OBJECTS = $(am_test_ks_OBJECTS) + test_ks_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libelektra-cpp.a \ + ../../../libelektra/libelektra.a +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(test_kdb_SOURCES) $(test_key_SOURCES) $(test_ks_SOURCES) + DIST_SOURCES = $(test_kdb_SOURCES) $(test_key_SOURCES) \ + $(test_ks_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -113,8 +109,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -125,20 +119,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -160,6 +145,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -175,25 +161,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -207,6 +189,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -217,7 +200,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -233,6 +215,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -246,6 +230,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -253,10 +238,11 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/bindings/cpp/include $(LTDLINCL) +-TESTS = test_key test_ks test_kdb + @VALGRINDTESTS_TRUE@TESTS_ENVIRONMENT = $(VALGRIND) --quiet --show-reachable=yes --leak-check=yes + test_key_SOURCES = test_key.cpp tests.h tests.cpp + test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a +@@ -306,13 +292,13 @@ clean-checkPROGRAMS: + done + test_kdb$(EXEEXT): $(test_kdb_OBJECTS) $(test_kdb_DEPENDENCIES) + @rm -f test_kdb$(EXEEXT) +- $(CXXLINK) $(test_kdb_LDFLAGS) $(test_kdb_OBJECTS) $(test_kdb_LDADD) $(LIBS) ++ $(CXXLINK) $(test_kdb_OBJECTS) $(test_kdb_LDADD) $(LIBS) + test_key$(EXEEXT): $(test_key_OBJECTS) $(test_key_DEPENDENCIES) + @rm -f test_key$(EXEEXT) +- $(CXXLINK) $(test_key_LDFLAGS) $(test_key_OBJECTS) $(test_key_LDADD) $(LIBS) ++ $(CXXLINK) $(test_key_OBJECTS) $(test_key_LDADD) $(LIBS) + test_ks$(EXEEXT): $(test_ks_OBJECTS) $(test_ks_DEPENDENCIES) + @rm -f test_ks$(EXEEXT) +- $(CXXLINK) $(test_ks_LDFLAGS) $(test_ks_OBJECTS) $(test_ks_LDADD) $(LIBS) ++ $(CXXLINK) $(test_ks_OBJECTS) $(test_ks_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -326,22 +312,22 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@ + + .cpp.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + + .cpp.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .cpp.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@@ -352,17 +338,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -374,8 +356,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -385,13 +367,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -405,9 +386,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -416,7 +397,7 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ ++ *$$ws$$tst$$ws*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -428,7 +409,7 @@ check-TESTS: $(TESTS) + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ ++ *$$ws$$tst$$ws*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -478,22 +459,21 @@ check-TESTS: $(TESTS) + else :; fi + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -543,7 +523,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -557,12 +537,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -583,19 +571,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool clean-local \ + 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-info-am ++ tags uninstall uninstall-am + + + ../libelektra-cpp.a: +Index: elektra-0.7.0rc5/src/bindings/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/bindings/Makefile.in ++++ elektra-0.7.0rc5/src/bindings/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + # $Id: Makefile.am 658 2006-03-05 11:31:26Z aviram $ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,8 +37,7 @@ target_triplet = @target@ + subdir = src/bindings + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -51,17 +47,17 @@ SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -87,8 +83,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -99,20 +93,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -134,6 +119,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -149,25 +135,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -181,6 +163,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -191,7 +174,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -207,6 +189,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -220,6 +204,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -227,6 +212,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + DIST_SUBDIRS = cpp python +@@ -270,10 +257,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -305,8 +288,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -350,8 +332,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -376,8 +358,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -387,13 +369,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -407,22 +388,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -436,7 +416,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -444,6 +424,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -483,8 +465,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -498,12 +479,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -522,22 +511,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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 installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/src/bindings/python/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/bindings/python/Makefile.in ++++ elektra-0.7.0rc5/src/bindings/python/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,13 +14,10 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -39,8 +36,7 @@ target_triplet = @target@ + subdir = src/bindings/python + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -58,26 +54,27 @@ LTLIBRARIES = $(lib_LTLIBRARIES) + libelektra_la_DEPENDENCIES = ../../libelektra/libelektra.la + am_libelektra_la_OBJECTS = libelektra_la-libpyelektra.lo + libelektra_la_OBJECTS = $(am_libelektra_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libelektra_la_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_la_SOURCES) + DIST_SOURCES = $(libelektra_la_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -103,8 +100,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -115,20 +110,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -150,6 +136,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -165,25 +152,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -197,6 +180,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -207,7 +191,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -223,6 +206,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -236,6 +221,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -243,6 +229,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + PYVER = 2.4 +@@ -286,21 +274,21 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: +@@ -312,7 +300,7 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra.la: $(libelektra_la_OBJECTS) $(libelektra_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libelektra_la_LDFLAGS) $(libelektra_la_OBJECTS) $(libelektra_la_LIBADD) $(LIBS) ++ $(libelektra_la_LINK) -rpath $(libdir) $(libelektra_la_OBJECTS) $(libelektra_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -323,32 +311,32 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_la-libpyelektra.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_la-libpyelektra.lo: libpyelektra.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-libpyelektra.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-libpyelektra.Tpo" -c -o libelektra_la-libpyelektra.lo `test -f 'libpyelektra.c' || echo '$(srcdir)/'`libpyelektra.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-libpyelektra.Tpo" "$(DEPDIR)/libelektra_la-libpyelektra.Plo"; else rm -f "$(DEPDIR)/libelektra_la-libpyelektra.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-libpyelektra.lo -MD -MP -MF $(DEPDIR)/libelektra_la-libpyelektra.Tpo -c -o libelektra_la-libpyelektra.lo `test -f 'libpyelektra.c' || echo '$(srcdir)/'`libpyelektra.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-libpyelektra.Tpo $(DEPDIR)/libelektra_la-libpyelektra.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libpyelektra.c' object='libelektra_la-libpyelektra.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-libpyelektra.lo `test -f 'libpyelektra.c' || echo '$(srcdir)/'`libpyelektra.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-libpyelektra.lo `test -f 'libpyelektra.c' || echo '$(srcdir)/'`libpyelektra.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -356,17 +344,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -378,8 +362,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -389,13 +373,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -409,22 +392,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -440,7 +422,7 @@ check: check-am + all-am: Makefile $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -475,7 +457,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -489,12 +471,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -515,20 +505,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ++uninstall-am: uninstall-libLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES 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-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-libLTLIBRARIES install-man install-strip installcheck \ ++ 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-libLTLIBRARIES 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-info-am \ +- uninstall-libLTLIBRARIES ++ tags uninstall uninstall-am uninstall-libLTLIBRARIES + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/src/include/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/include/Makefile.in ++++ elektra-0.7.0rc5/src/include/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,13 +16,10 @@ + + # $Id$ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ subdir = src/include + DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -63,10 +59,7 @@ HEADERS = $(nobase_include_HEADERS) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -92,8 +85,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -104,20 +95,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -139,6 +121,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -154,25 +137,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -186,6 +165,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -196,7 +176,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -212,6 +191,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -225,6 +206,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -232,6 +214,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + nobase_include_HEADERS = kdb.h kdbloader.h kdbbackend.h kdbtools.h kdbprivate.h kdbos.h +@@ -274,7 +258,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +@@ -293,13 +277,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-nobase_includeHEADERS: $(nobase_include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" ++ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @$(am__vpath_adj_setup) \ + list='$(nobase_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +@@ -322,8 +302,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -335,8 +315,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -346,13 +326,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -366,22 +345,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -397,7 +375,7 @@ check: check-am + all-am: Makefile $(HEADERS) config.h + installdirs: + for dir in "$(DESTDIR)$(includedir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -430,8 +408,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-hdr \ +- distclean-libtool distclean-tags ++distclean-am: clean-am distclean-generic distclean-hdr distclean-tags + + dvi: dvi-am + +@@ -445,12 +422,20 @@ info-am: + + install-data-am: install-nobase_includeHEADERS + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -469,19 +454,22 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS ++uninstall-am: uninstall-nobase_includeHEADERS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ ++ 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-nobase_includeHEADERS \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ +- uninstall-nobase_includeHEADERS ++ tags uninstall uninstall-am uninstall-nobase_includeHEADERS + + + kdbprivate.h: kdbprivate.h.in ../../config.status +Index: elektra-0.7.0rc5/src/kdb/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/kdb/Makefile.in ++++ elektra-0.7.0rc5/src/kdb/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,13 +16,10 @@ + + # $Id$ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -38,17 +35,17 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-bin_PROGRAMS = kdb$(EXEEXT) kdb_static$(EXEEXT) ++bin_PROGRAMS = kdb$(EXEEXT) $(am__EXEEXT_1) + subdir = src/kdb + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/src/include/config.h + CONFIG_CLEAN_FILES = ++@ENABLE_STATIC_TRUE@am__EXEEXT_1 = kdb_static$(EXEEXT) + am__installdirs = "$(DESTDIR)$(bindir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) +@@ -59,32 +56,40 @@ kdb_OBJECTS = $(am_kdb_OBJECTS) + am__DEPENDENCIES_1 = + kdb_DEPENDENCIES = ../libelektra/libelektra.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ++kdb_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(kdb_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++am__kdb_static_SOURCES_DIST = kdb-tool.c kdb-tool.h help.c BSDgetopt.c \ ++ BSDgetopt.h ../include/kdb.h ../include/kdbloader.h \ ++ ../include/kdbtools.h + am__objects_2 = kdb_static-kdb-tool.$(OBJEXT) \ + kdb_static-help.$(OBJEXT) kdb_static-BSDgetopt.$(OBJEXT) +-am_kdb_static_OBJECTS = $(am__objects_2) ++@ENABLE_STATIC_TRUE@am_kdb_static_OBJECTS = $(am__objects_2) + kdb_static_OBJECTS = $(am_kdb_static_OBJECTS) +-kdb_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- ../libelektra/libelektra.a $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++@ENABLE_STATIC_TRUE@kdb_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++@ENABLE_STATIC_TRUE@ ../libelektra/libelektra.a \ ++@ENABLE_STATIC_TRUE@ $(am__DEPENDENCIES_1) ++kdb_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(kdb_static_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(kdb_SOURCES) $(kdb_static_SOURCES) +-DIST_SOURCES = $(kdb_SOURCES) $(kdb_static_SOURCES) ++DIST_SOURCES = $(kdb_SOURCES) $(am__kdb_static_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -110,8 +115,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -122,20 +125,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -157,6 +151,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -172,25 +167,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -204,6 +195,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -214,7 +206,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -230,6 +221,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -243,6 +236,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -250,16 +244,20 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL) + kdb_source = kdb-tool.c kdb-tool.h help.c BSDgetopt.c BSDgetopt.h ../include/kdb.h ../include/kdbloader.h ../include/kdbtools.h ++@ENABLE_STATIC_FALSE@KDB_STATIC = ++@ENABLE_STATIC_TRUE@KDB_STATIC = kdb_static + kdb_SOURCES = $(kdb_source) + kdb_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV) + kdb_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) +-kdb_static_SOURCES = $(kdb_source) +-kdb_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV) +-kdb_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS) ++@ENABLE_STATIC_TRUE@kdb_static_SOURCES = $(kdb_source) ++@ENABLE_STATIC_TRUE@kdb_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV) ++@ENABLE_STATIC_TRUE@kdb_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS) + all: all-am + + .SUFFIXES: +@@ -295,15 +293,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -323,10 +321,10 @@ clean-binPROGRAMS: + done + kdb$(EXEEXT): $(kdb_OBJECTS) $(kdb_DEPENDENCIES) + @rm -f kdb$(EXEEXT) +- $(LINK) $(kdb_LDFLAGS) $(kdb_OBJECTS) $(kdb_LDADD) $(LIBS) ++ $(kdb_LINK) $(kdb_OBJECTS) $(kdb_LDADD) $(LIBS) + kdb_static$(EXEEXT): $(kdb_static_OBJECTS) $(kdb_static_DEPENDENCIES) + @rm -f kdb_static$(EXEEXT) +- $(LINK) $(kdb_static_LDFLAGS) $(kdb_static_OBJECTS) $(kdb_static_LDADD) $(LIBS) ++ $(kdb_static_LINK) $(kdb_static_OBJECTS) $(kdb_static_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -342,106 +340,106 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdb_static-kdb-tool.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + kdb-kdb-tool.o: kdb-tool.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-kdb-tool.o -MD -MP -MF "$(DEPDIR)/kdb-kdb-tool.Tpo" -c -o kdb-kdb-tool.o `test -f 'kdb-tool.c' || echo '$(srcdir)/'`kdb-tool.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb-kdb-tool.Tpo" "$(DEPDIR)/kdb-kdb-tool.Po"; else rm -f "$(DEPDIR)/kdb-kdb-tool.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-kdb-tool.o -MD -MP -MF $(DEPDIR)/kdb-kdb-tool.Tpo -c -o kdb-kdb-tool.o `test -f 'kdb-tool.c' || echo '$(srcdir)/'`kdb-tool.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb-kdb-tool.Tpo $(DEPDIR)/kdb-kdb-tool.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb-tool.c' object='kdb-kdb-tool.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -c -o kdb-kdb-tool.o `test -f 'kdb-tool.c' || echo '$(srcdir)/'`kdb-tool.c + + kdb-kdb-tool.obj: kdb-tool.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-kdb-tool.obj -MD -MP -MF "$(DEPDIR)/kdb-kdb-tool.Tpo" -c -o kdb-kdb-tool.obj `if test -f 'kdb-tool.c'; then $(CYGPATH_W) 'kdb-tool.c'; else $(CYGPATH_W) '$(srcdir)/kdb-tool.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb-kdb-tool.Tpo" "$(DEPDIR)/kdb-kdb-tool.Po"; else rm -f "$(DEPDIR)/kdb-kdb-tool.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-kdb-tool.obj -MD -MP -MF $(DEPDIR)/kdb-kdb-tool.Tpo -c -o kdb-kdb-tool.obj `if test -f 'kdb-tool.c'; then $(CYGPATH_W) 'kdb-tool.c'; else $(CYGPATH_W) '$(srcdir)/kdb-tool.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb-kdb-tool.Tpo $(DEPDIR)/kdb-kdb-tool.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb-tool.c' object='kdb-kdb-tool.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -c -o kdb-kdb-tool.obj `if test -f 'kdb-tool.c'; then $(CYGPATH_W) 'kdb-tool.c'; else $(CYGPATH_W) '$(srcdir)/kdb-tool.c'; fi` + + kdb-help.o: help.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-help.o -MD -MP -MF "$(DEPDIR)/kdb-help.Tpo" -c -o kdb-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb-help.Tpo" "$(DEPDIR)/kdb-help.Po"; else rm -f "$(DEPDIR)/kdb-help.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-help.o -MD -MP -MF $(DEPDIR)/kdb-help.Tpo -c -o kdb-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb-help.Tpo $(DEPDIR)/kdb-help.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='help.c' object='kdb-help.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -c -o kdb-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c + + kdb-help.obj: help.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-help.obj -MD -MP -MF "$(DEPDIR)/kdb-help.Tpo" -c -o kdb-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb-help.Tpo" "$(DEPDIR)/kdb-help.Po"; else rm -f "$(DEPDIR)/kdb-help.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-help.obj -MD -MP -MF $(DEPDIR)/kdb-help.Tpo -c -o kdb-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb-help.Tpo $(DEPDIR)/kdb-help.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='help.c' object='kdb-help.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -c -o kdb-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` + + kdb-BSDgetopt.o: BSDgetopt.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-BSDgetopt.o -MD -MP -MF "$(DEPDIR)/kdb-BSDgetopt.Tpo" -c -o kdb-BSDgetopt.o `test -f 'BSDgetopt.c' || echo '$(srcdir)/'`BSDgetopt.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb-BSDgetopt.Tpo" "$(DEPDIR)/kdb-BSDgetopt.Po"; else rm -f "$(DEPDIR)/kdb-BSDgetopt.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-BSDgetopt.o -MD -MP -MF $(DEPDIR)/kdb-BSDgetopt.Tpo -c -o kdb-BSDgetopt.o `test -f 'BSDgetopt.c' || echo '$(srcdir)/'`BSDgetopt.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb-BSDgetopt.Tpo $(DEPDIR)/kdb-BSDgetopt.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='BSDgetopt.c' object='kdb-BSDgetopt.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -c -o kdb-BSDgetopt.o `test -f 'BSDgetopt.c' || echo '$(srcdir)/'`BSDgetopt.c + + kdb-BSDgetopt.obj: BSDgetopt.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-BSDgetopt.obj -MD -MP -MF "$(DEPDIR)/kdb-BSDgetopt.Tpo" -c -o kdb-BSDgetopt.obj `if test -f 'BSDgetopt.c'; then $(CYGPATH_W) 'BSDgetopt.c'; else $(CYGPATH_W) '$(srcdir)/BSDgetopt.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb-BSDgetopt.Tpo" "$(DEPDIR)/kdb-BSDgetopt.Po"; else rm -f "$(DEPDIR)/kdb-BSDgetopt.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -MT kdb-BSDgetopt.obj -MD -MP -MF $(DEPDIR)/kdb-BSDgetopt.Tpo -c -o kdb-BSDgetopt.obj `if test -f 'BSDgetopt.c'; then $(CYGPATH_W) 'BSDgetopt.c'; else $(CYGPATH_W) '$(srcdir)/BSDgetopt.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb-BSDgetopt.Tpo $(DEPDIR)/kdb-BSDgetopt.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='BSDgetopt.c' object='kdb-BSDgetopt.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_CFLAGS) $(CFLAGS) -c -o kdb-BSDgetopt.obj `if test -f 'BSDgetopt.c'; then $(CYGPATH_W) 'BSDgetopt.c'; else $(CYGPATH_W) '$(srcdir)/BSDgetopt.c'; fi` + + kdb_static-kdb-tool.o: kdb-tool.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-kdb-tool.o -MD -MP -MF "$(DEPDIR)/kdb_static-kdb-tool.Tpo" -c -o kdb_static-kdb-tool.o `test -f 'kdb-tool.c' || echo '$(srcdir)/'`kdb-tool.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb_static-kdb-tool.Tpo" "$(DEPDIR)/kdb_static-kdb-tool.Po"; else rm -f "$(DEPDIR)/kdb_static-kdb-tool.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-kdb-tool.o -MD -MP -MF $(DEPDIR)/kdb_static-kdb-tool.Tpo -c -o kdb_static-kdb-tool.o `test -f 'kdb-tool.c' || echo '$(srcdir)/'`kdb-tool.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb_static-kdb-tool.Tpo $(DEPDIR)/kdb_static-kdb-tool.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb-tool.c' object='kdb_static-kdb-tool.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -c -o kdb_static-kdb-tool.o `test -f 'kdb-tool.c' || echo '$(srcdir)/'`kdb-tool.c + + kdb_static-kdb-tool.obj: kdb-tool.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-kdb-tool.obj -MD -MP -MF "$(DEPDIR)/kdb_static-kdb-tool.Tpo" -c -o kdb_static-kdb-tool.obj `if test -f 'kdb-tool.c'; then $(CYGPATH_W) 'kdb-tool.c'; else $(CYGPATH_W) '$(srcdir)/kdb-tool.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb_static-kdb-tool.Tpo" "$(DEPDIR)/kdb_static-kdb-tool.Po"; else rm -f "$(DEPDIR)/kdb_static-kdb-tool.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-kdb-tool.obj -MD -MP -MF $(DEPDIR)/kdb_static-kdb-tool.Tpo -c -o kdb_static-kdb-tool.obj `if test -f 'kdb-tool.c'; then $(CYGPATH_W) 'kdb-tool.c'; else $(CYGPATH_W) '$(srcdir)/kdb-tool.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb_static-kdb-tool.Tpo $(DEPDIR)/kdb_static-kdb-tool.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb-tool.c' object='kdb_static-kdb-tool.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -c -o kdb_static-kdb-tool.obj `if test -f 'kdb-tool.c'; then $(CYGPATH_W) 'kdb-tool.c'; else $(CYGPATH_W) '$(srcdir)/kdb-tool.c'; fi` + + kdb_static-help.o: help.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-help.o -MD -MP -MF "$(DEPDIR)/kdb_static-help.Tpo" -c -o kdb_static-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb_static-help.Tpo" "$(DEPDIR)/kdb_static-help.Po"; else rm -f "$(DEPDIR)/kdb_static-help.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-help.o -MD -MP -MF $(DEPDIR)/kdb_static-help.Tpo -c -o kdb_static-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb_static-help.Tpo $(DEPDIR)/kdb_static-help.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='help.c' object='kdb_static-help.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -c -o kdb_static-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c + + kdb_static-help.obj: help.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-help.obj -MD -MP -MF "$(DEPDIR)/kdb_static-help.Tpo" -c -o kdb_static-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb_static-help.Tpo" "$(DEPDIR)/kdb_static-help.Po"; else rm -f "$(DEPDIR)/kdb_static-help.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-help.obj -MD -MP -MF $(DEPDIR)/kdb_static-help.Tpo -c -o kdb_static-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb_static-help.Tpo $(DEPDIR)/kdb_static-help.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='help.c' object='kdb_static-help.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -c -o kdb_static-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` + + kdb_static-BSDgetopt.o: BSDgetopt.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-BSDgetopt.o -MD -MP -MF "$(DEPDIR)/kdb_static-BSDgetopt.Tpo" -c -o kdb_static-BSDgetopt.o `test -f 'BSDgetopt.c' || echo '$(srcdir)/'`BSDgetopt.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb_static-BSDgetopt.Tpo" "$(DEPDIR)/kdb_static-BSDgetopt.Po"; else rm -f "$(DEPDIR)/kdb_static-BSDgetopt.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-BSDgetopt.o -MD -MP -MF $(DEPDIR)/kdb_static-BSDgetopt.Tpo -c -o kdb_static-BSDgetopt.o `test -f 'BSDgetopt.c' || echo '$(srcdir)/'`BSDgetopt.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb_static-BSDgetopt.Tpo $(DEPDIR)/kdb_static-BSDgetopt.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='BSDgetopt.c' object='kdb_static-BSDgetopt.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -c -o kdb_static-BSDgetopt.o `test -f 'BSDgetopt.c' || echo '$(srcdir)/'`BSDgetopt.c + + kdb_static-BSDgetopt.obj: BSDgetopt.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-BSDgetopt.obj -MD -MP -MF "$(DEPDIR)/kdb_static-BSDgetopt.Tpo" -c -o kdb_static-BSDgetopt.obj `if test -f 'BSDgetopt.c'; then $(CYGPATH_W) 'BSDgetopt.c'; else $(CYGPATH_W) '$(srcdir)/BSDgetopt.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kdb_static-BSDgetopt.Tpo" "$(DEPDIR)/kdb_static-BSDgetopt.Po"; else rm -f "$(DEPDIR)/kdb_static-BSDgetopt.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -MT kdb_static-BSDgetopt.obj -MD -MP -MF $(DEPDIR)/kdb_static-BSDgetopt.Tpo -c -o kdb_static-BSDgetopt.obj `if test -f 'BSDgetopt.c'; then $(CYGPATH_W) 'BSDgetopt.c'; else $(CYGPATH_W) '$(srcdir)/BSDgetopt.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/kdb_static-BSDgetopt.Tpo $(DEPDIR)/kdb_static-BSDgetopt.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='BSDgetopt.c' object='kdb_static-BSDgetopt.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kdb_static_CFLAGS) $(CFLAGS) -c -o kdb_static-BSDgetopt.obj `if test -f 'BSDgetopt.c'; then $(CYGPATH_W) 'BSDgetopt.c'; else $(CYGPATH_W) '$(srcdir)/BSDgetopt.c'; fi` +@@ -452,17 +450,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -474,8 +468,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -485,13 +479,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -505,22 +498,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -536,7 +528,7 @@ check: check-am + all-am: Makefile $(PROGRAMS) + installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -571,7 +563,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -585,12 +577,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -611,24 +611,27 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am ++uninstall-am: uninstall-binPROGRAMS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool clean-local 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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 \ +- uninstall-info-am ++ tags uninstall uninstall-am uninstall-binPROGRAMS + + +-../libelektra/libelektra.a: +- cd ../libelektra && $(MAKE) libelektra.a ++@ENABLE_STATIC_TRUE@../libelektra/libelektra.a: ++@ENABLE_STATIC_TRUE@ cd ../libelektra && $(MAKE) libelektra.a + + clean-local: + rm -f *.gcno *.gcda *.gcno +Index: elektra-0.7.0rc5/src/libelektra/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/libelektra/Makefile.in ++++ elektra-0.7.0rc5/src/libelektra/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ subdir = src/libelektra + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/exportobjects.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -86,26 +82,27 @@ am__objects_2 = libelektra_la-kdb.lo lib + libelektra_la-split.lo + am_libelektra_la_OBJECTS = $(am__objects_2) + libelektra_la_OBJECTS = $(am_libelektra_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libelektra_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libelektra_la_CFLAGS) \ ++ $(CFLAGS) $(libelektra_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektra_a_SOURCES) $(libelektra_la_SOURCES) + DIST_SOURCES = $(libelektra_a_SOURCES) $(libelektra_la_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -131,8 +128,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -143,20 +138,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -178,6 +164,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -193,25 +180,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -225,6 +208,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -235,7 +219,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -251,6 +234,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -264,6 +249,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -271,6 +257,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL) +@@ -347,7 +335,7 @@ exportobjects.sh: $(top_builddir)/config + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLIBRARIES: $(lib_LIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -380,21 +368,21 @@ libelektra.a: $(libelektra_a_OBJECTS) $( + $(RANLIB) libelektra.a + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: +@@ -406,7 +394,7 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektra.la: $(libelektra_la_OBJECTS) $(libelektra_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libelektra_la_LDFLAGS) $(libelektra_la_OBJECTS) $(libelektra_la_LIBADD) $(LIBS) ++ $(libelektra_la_LINK) -rpath $(libdir) $(libelektra_la_OBJECTS) $(libelektra_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -447,354 +435,354 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektra_la-trie.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektra_a-kdb.o: kdb.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdb.o -MD -MP -MF "$(DEPDIR)/libelektra_a-kdb.Tpo" -c -o libelektra_a-kdb.o `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdb.Tpo" "$(DEPDIR)/libelektra_a-kdb.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdb.o -MD -MP -MF $(DEPDIR)/libelektra_a-kdb.Tpo -c -o libelektra_a-kdb.o `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdb.Tpo $(DEPDIR)/libelektra_a-kdb.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb.c' object='libelektra_a-kdb.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdb.o `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c + + libelektra_a-kdb.obj: kdb.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdb.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-kdb.Tpo" -c -o libelektra_a-kdb.obj `if test -f 'kdb.c'; then $(CYGPATH_W) 'kdb.c'; else $(CYGPATH_W) '$(srcdir)/kdb.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdb.Tpo" "$(DEPDIR)/libelektra_a-kdb.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdb.obj -MD -MP -MF $(DEPDIR)/libelektra_a-kdb.Tpo -c -o libelektra_a-kdb.obj `if test -f 'kdb.c'; then $(CYGPATH_W) 'kdb.c'; else $(CYGPATH_W) '$(srcdir)/kdb.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdb.Tpo $(DEPDIR)/libelektra_a-kdb.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb.c' object='libelektra_a-kdb.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdb.obj `if test -f 'kdb.c'; then $(CYGPATH_W) 'kdb.c'; else $(CYGPATH_W) '$(srcdir)/kdb.c'; fi` + + libelektra_a-kdbhandle.o: kdbhandle.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhandle.o -MD -MP -MF "$(DEPDIR)/libelektra_a-kdbhandle.Tpo" -c -o libelektra_a-kdbhandle.o `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdbhandle.Tpo" "$(DEPDIR)/libelektra_a-kdbhandle.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdbhandle.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhandle.o -MD -MP -MF $(DEPDIR)/libelektra_a-kdbhandle.Tpo -c -o libelektra_a-kdbhandle.o `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdbhandle.Tpo $(DEPDIR)/libelektra_a-kdbhandle.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbhandle.c' object='libelektra_a-kdbhandle.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdbhandle.o `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c + + libelektra_a-kdbhandle.obj: kdbhandle.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhandle.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-kdbhandle.Tpo" -c -o libelektra_a-kdbhandle.obj `if test -f 'kdbhandle.c'; then $(CYGPATH_W) 'kdbhandle.c'; else $(CYGPATH_W) '$(srcdir)/kdbhandle.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdbhandle.Tpo" "$(DEPDIR)/libelektra_a-kdbhandle.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdbhandle.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhandle.obj -MD -MP -MF $(DEPDIR)/libelektra_a-kdbhandle.Tpo -c -o libelektra_a-kdbhandle.obj `if test -f 'kdbhandle.c'; then $(CYGPATH_W) 'kdbhandle.c'; else $(CYGPATH_W) '$(srcdir)/kdbhandle.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdbhandle.Tpo $(DEPDIR)/libelektra_a-kdbhandle.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbhandle.c' object='libelektra_a-kdbhandle.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdbhandle.obj `if test -f 'kdbhandle.c'; then $(CYGPATH_W) 'kdbhandle.c'; else $(CYGPATH_W) '$(srcdir)/kdbhandle.c'; fi` + + libelektra_a-error.o: error.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-error.o -MD -MP -MF "$(DEPDIR)/libelektra_a-error.Tpo" -c -o libelektra_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-error.Tpo" "$(DEPDIR)/libelektra_a-error.Po"; else rm -f "$(DEPDIR)/libelektra_a-error.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-error.o -MD -MP -MF $(DEPDIR)/libelektra_a-error.Tpo -c -o libelektra_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-error.Tpo $(DEPDIR)/libelektra_a-error.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='error.c' object='libelektra_a-error.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c + + libelektra_a-error.obj: error.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-error.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-error.Tpo" -c -o libelektra_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-error.Tpo" "$(DEPDIR)/libelektra_a-error.Po"; else rm -f "$(DEPDIR)/libelektra_a-error.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-error.obj -MD -MP -MF $(DEPDIR)/libelektra_a-error.Tpo -c -o libelektra_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-error.Tpo $(DEPDIR)/libelektra_a-error.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='error.c' object='libelektra_a-error.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi` + + libelektra_a-key.o: key.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-key.o -MD -MP -MF "$(DEPDIR)/libelektra_a-key.Tpo" -c -o libelektra_a-key.o `test -f 'key.c' || echo '$(srcdir)/'`key.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-key.Tpo" "$(DEPDIR)/libelektra_a-key.Po"; else rm -f "$(DEPDIR)/libelektra_a-key.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-key.o -MD -MP -MF $(DEPDIR)/libelektra_a-key.Tpo -c -o libelektra_a-key.o `test -f 'key.c' || echo '$(srcdir)/'`key.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-key.Tpo $(DEPDIR)/libelektra_a-key.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='key.c' object='libelektra_a-key.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-key.o `test -f 'key.c' || echo '$(srcdir)/'`key.c + + libelektra_a-key.obj: key.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-key.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-key.Tpo" -c -o libelektra_a-key.obj `if test -f 'key.c'; then $(CYGPATH_W) 'key.c'; else $(CYGPATH_W) '$(srcdir)/key.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-key.Tpo" "$(DEPDIR)/libelektra_a-key.Po"; else rm -f "$(DEPDIR)/libelektra_a-key.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-key.obj -MD -MP -MF $(DEPDIR)/libelektra_a-key.Tpo -c -o libelektra_a-key.obj `if test -f 'key.c'; then $(CYGPATH_W) 'key.c'; else $(CYGPATH_W) '$(srcdir)/key.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-key.Tpo $(DEPDIR)/libelektra_a-key.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='key.c' object='libelektra_a-key.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-key.obj `if test -f 'key.c'; then $(CYGPATH_W) 'key.c'; else $(CYGPATH_W) '$(srcdir)/key.c'; fi` + + libelektra_a-keyset.o: keyset.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyset.o -MD -MP -MF "$(DEPDIR)/libelektra_a-keyset.Tpo" -c -o libelektra_a-keyset.o `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyset.Tpo" "$(DEPDIR)/libelektra_a-keyset.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyset.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyset.o -MD -MP -MF $(DEPDIR)/libelektra_a-keyset.Tpo -c -o libelektra_a-keyset.o `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyset.Tpo $(DEPDIR)/libelektra_a-keyset.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyset.c' object='libelektra_a-keyset.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyset.o `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c + + libelektra_a-keyset.obj: keyset.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyset.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-keyset.Tpo" -c -o libelektra_a-keyset.obj `if test -f 'keyset.c'; then $(CYGPATH_W) 'keyset.c'; else $(CYGPATH_W) '$(srcdir)/keyset.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyset.Tpo" "$(DEPDIR)/libelektra_a-keyset.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyset.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyset.obj -MD -MP -MF $(DEPDIR)/libelektra_a-keyset.Tpo -c -o libelektra_a-keyset.obj `if test -f 'keyset.c'; then $(CYGPATH_W) 'keyset.c'; else $(CYGPATH_W) '$(srcdir)/keyset.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyset.Tpo $(DEPDIR)/libelektra_a-keyset.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyset.c' object='libelektra_a-keyset.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyset.obj `if test -f 'keyset.c'; then $(CYGPATH_W) 'keyset.c'; else $(CYGPATH_W) '$(srcdir)/keyset.c'; fi` + + libelektra_a-trie.o: trie.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-trie.o -MD -MP -MF "$(DEPDIR)/libelektra_a-trie.Tpo" -c -o libelektra_a-trie.o `test -f 'trie.c' || echo '$(srcdir)/'`trie.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-trie.Tpo" "$(DEPDIR)/libelektra_a-trie.Po"; else rm -f "$(DEPDIR)/libelektra_a-trie.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-trie.o -MD -MP -MF $(DEPDIR)/libelektra_a-trie.Tpo -c -o libelektra_a-trie.o `test -f 'trie.c' || echo '$(srcdir)/'`trie.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-trie.Tpo $(DEPDIR)/libelektra_a-trie.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trie.c' object='libelektra_a-trie.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-trie.o `test -f 'trie.c' || echo '$(srcdir)/'`trie.c + + libelektra_a-trie.obj: trie.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-trie.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-trie.Tpo" -c -o libelektra_a-trie.obj `if test -f 'trie.c'; then $(CYGPATH_W) 'trie.c'; else $(CYGPATH_W) '$(srcdir)/trie.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-trie.Tpo" "$(DEPDIR)/libelektra_a-trie.Po"; else rm -f "$(DEPDIR)/libelektra_a-trie.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-trie.obj -MD -MP -MF $(DEPDIR)/libelektra_a-trie.Tpo -c -o libelektra_a-trie.obj `if test -f 'trie.c'; then $(CYGPATH_W) 'trie.c'; else $(CYGPATH_W) '$(srcdir)/trie.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-trie.Tpo $(DEPDIR)/libelektra_a-trie.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trie.c' object='libelektra_a-trie.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-trie.obj `if test -f 'trie.c'; then $(CYGPATH_W) 'trie.c'; else $(CYGPATH_W) '$(srcdir)/trie.c'; fi` + + libelektra_a-kdbhighlevel.o: kdbhighlevel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhighlevel.o -MD -MP -MF "$(DEPDIR)/libelektra_a-kdbhighlevel.Tpo" -c -o libelektra_a-kdbhighlevel.o `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdbhighlevel.Tpo" "$(DEPDIR)/libelektra_a-kdbhighlevel.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdbhighlevel.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhighlevel.o -MD -MP -MF $(DEPDIR)/libelektra_a-kdbhighlevel.Tpo -c -o libelektra_a-kdbhighlevel.o `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdbhighlevel.Tpo $(DEPDIR)/libelektra_a-kdbhighlevel.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbhighlevel.c' object='libelektra_a-kdbhighlevel.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdbhighlevel.o `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c + + libelektra_a-kdbhighlevel.obj: kdbhighlevel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhighlevel.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-kdbhighlevel.Tpo" -c -o libelektra_a-kdbhighlevel.obj `if test -f 'kdbhighlevel.c'; then $(CYGPATH_W) 'kdbhighlevel.c'; else $(CYGPATH_W) '$(srcdir)/kdbhighlevel.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdbhighlevel.Tpo" "$(DEPDIR)/libelektra_a-kdbhighlevel.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdbhighlevel.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbhighlevel.obj -MD -MP -MF $(DEPDIR)/libelektra_a-kdbhighlevel.Tpo -c -o libelektra_a-kdbhighlevel.obj `if test -f 'kdbhighlevel.c'; then $(CYGPATH_W) 'kdbhighlevel.c'; else $(CYGPATH_W) '$(srcdir)/kdbhighlevel.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdbhighlevel.Tpo $(DEPDIR)/libelektra_a-kdbhighlevel.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbhighlevel.c' object='libelektra_a-kdbhighlevel.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdbhighlevel.obj `if test -f 'kdbhighlevel.c'; then $(CYGPATH_W) 'kdbhighlevel.c'; else $(CYGPATH_W) '$(srcdir)/kdbhighlevel.c'; fi` + + libelektra_a-kdbcapability.o: kdbcapability.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbcapability.o -MD -MP -MF "$(DEPDIR)/libelektra_a-kdbcapability.Tpo" -c -o libelektra_a-kdbcapability.o `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdbcapability.Tpo" "$(DEPDIR)/libelektra_a-kdbcapability.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdbcapability.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbcapability.o -MD -MP -MF $(DEPDIR)/libelektra_a-kdbcapability.Tpo -c -o libelektra_a-kdbcapability.o `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdbcapability.Tpo $(DEPDIR)/libelektra_a-kdbcapability.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbcapability.c' object='libelektra_a-kdbcapability.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdbcapability.o `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c + + libelektra_a-kdbcapability.obj: kdbcapability.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbcapability.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-kdbcapability.Tpo" -c -o libelektra_a-kdbcapability.obj `if test -f 'kdbcapability.c'; then $(CYGPATH_W) 'kdbcapability.c'; else $(CYGPATH_W) '$(srcdir)/kdbcapability.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-kdbcapability.Tpo" "$(DEPDIR)/libelektra_a-kdbcapability.Po"; else rm -f "$(DEPDIR)/libelektra_a-kdbcapability.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-kdbcapability.obj -MD -MP -MF $(DEPDIR)/libelektra_a-kdbcapability.Tpo -c -o libelektra_a-kdbcapability.obj `if test -f 'kdbcapability.c'; then $(CYGPATH_W) 'kdbcapability.c'; else $(CYGPATH_W) '$(srcdir)/kdbcapability.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-kdbcapability.Tpo $(DEPDIR)/libelektra_a-kdbcapability.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbcapability.c' object='libelektra_a-kdbcapability.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-kdbcapability.obj `if test -f 'kdbcapability.c'; then $(CYGPATH_W) 'kdbcapability.c'; else $(CYGPATH_W) '$(srcdir)/kdbcapability.c'; fi` + + libelektra_a-keyhelpers.o: keyhelpers.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyhelpers.o -MD -MP -MF "$(DEPDIR)/libelektra_a-keyhelpers.Tpo" -c -o libelektra_a-keyhelpers.o `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyhelpers.Tpo" "$(DEPDIR)/libelektra_a-keyhelpers.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyhelpers.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyhelpers.o -MD -MP -MF $(DEPDIR)/libelektra_a-keyhelpers.Tpo -c -o libelektra_a-keyhelpers.o `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyhelpers.Tpo $(DEPDIR)/libelektra_a-keyhelpers.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyhelpers.c' object='libelektra_a-keyhelpers.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyhelpers.o `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c + + libelektra_a-keyhelpers.obj: keyhelpers.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyhelpers.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-keyhelpers.Tpo" -c -o libelektra_a-keyhelpers.obj `if test -f 'keyhelpers.c'; then $(CYGPATH_W) 'keyhelpers.c'; else $(CYGPATH_W) '$(srcdir)/keyhelpers.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyhelpers.Tpo" "$(DEPDIR)/libelektra_a-keyhelpers.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyhelpers.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyhelpers.obj -MD -MP -MF $(DEPDIR)/libelektra_a-keyhelpers.Tpo -c -o libelektra_a-keyhelpers.obj `if test -f 'keyhelpers.c'; then $(CYGPATH_W) 'keyhelpers.c'; else $(CYGPATH_W) '$(srcdir)/keyhelpers.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyhelpers.Tpo $(DEPDIR)/libelektra_a-keyhelpers.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyhelpers.c' object='libelektra_a-keyhelpers.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyhelpers.obj `if test -f 'keyhelpers.c'; then $(CYGPATH_W) 'keyhelpers.c'; else $(CYGPATH_W) '$(srcdir)/keyhelpers.c'; fi` + + libelektra_a-keymeta.o: keymeta.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keymeta.o -MD -MP -MF "$(DEPDIR)/libelektra_a-keymeta.Tpo" -c -o libelektra_a-keymeta.o `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keymeta.Tpo" "$(DEPDIR)/libelektra_a-keymeta.Po"; else rm -f "$(DEPDIR)/libelektra_a-keymeta.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keymeta.o -MD -MP -MF $(DEPDIR)/libelektra_a-keymeta.Tpo -c -o libelektra_a-keymeta.o `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keymeta.Tpo $(DEPDIR)/libelektra_a-keymeta.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keymeta.c' object='libelektra_a-keymeta.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keymeta.o `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c + + libelektra_a-keymeta.obj: keymeta.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keymeta.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-keymeta.Tpo" -c -o libelektra_a-keymeta.obj `if test -f 'keymeta.c'; then $(CYGPATH_W) 'keymeta.c'; else $(CYGPATH_W) '$(srcdir)/keymeta.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keymeta.Tpo" "$(DEPDIR)/libelektra_a-keymeta.Po"; else rm -f "$(DEPDIR)/libelektra_a-keymeta.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keymeta.obj -MD -MP -MF $(DEPDIR)/libelektra_a-keymeta.Tpo -c -o libelektra_a-keymeta.obj `if test -f 'keymeta.c'; then $(CYGPATH_W) 'keymeta.c'; else $(CYGPATH_W) '$(srcdir)/keymeta.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keymeta.Tpo $(DEPDIR)/libelektra_a-keymeta.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keymeta.c' object='libelektra_a-keymeta.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keymeta.obj `if test -f 'keymeta.c'; then $(CYGPATH_W) 'keymeta.c'; else $(CYGPATH_W) '$(srcdir)/keymeta.c'; fi` + + libelektra_a-keyname.o: keyname.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyname.o -MD -MP -MF "$(DEPDIR)/libelektra_a-keyname.Tpo" -c -o libelektra_a-keyname.o `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyname.Tpo" "$(DEPDIR)/libelektra_a-keyname.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyname.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyname.o -MD -MP -MF $(DEPDIR)/libelektra_a-keyname.Tpo -c -o libelektra_a-keyname.o `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyname.Tpo $(DEPDIR)/libelektra_a-keyname.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyname.c' object='libelektra_a-keyname.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyname.o `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c + + libelektra_a-keyname.obj: keyname.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyname.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-keyname.Tpo" -c -o libelektra_a-keyname.obj `if test -f 'keyname.c'; then $(CYGPATH_W) 'keyname.c'; else $(CYGPATH_W) '$(srcdir)/keyname.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyname.Tpo" "$(DEPDIR)/libelektra_a-keyname.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyname.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyname.obj -MD -MP -MF $(DEPDIR)/libelektra_a-keyname.Tpo -c -o libelektra_a-keyname.obj `if test -f 'keyname.c'; then $(CYGPATH_W) 'keyname.c'; else $(CYGPATH_W) '$(srcdir)/keyname.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyname.Tpo $(DEPDIR)/libelektra_a-keyname.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyname.c' object='libelektra_a-keyname.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyname.obj `if test -f 'keyname.c'; then $(CYGPATH_W) 'keyname.c'; else $(CYGPATH_W) '$(srcdir)/keyname.c'; fi` + + libelektra_a-keytest.o: keytest.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keytest.o -MD -MP -MF "$(DEPDIR)/libelektra_a-keytest.Tpo" -c -o libelektra_a-keytest.o `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keytest.Tpo" "$(DEPDIR)/libelektra_a-keytest.Po"; else rm -f "$(DEPDIR)/libelektra_a-keytest.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keytest.o -MD -MP -MF $(DEPDIR)/libelektra_a-keytest.Tpo -c -o libelektra_a-keytest.o `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keytest.Tpo $(DEPDIR)/libelektra_a-keytest.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keytest.c' object='libelektra_a-keytest.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keytest.o `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c + + libelektra_a-keytest.obj: keytest.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keytest.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-keytest.Tpo" -c -o libelektra_a-keytest.obj `if test -f 'keytest.c'; then $(CYGPATH_W) 'keytest.c'; else $(CYGPATH_W) '$(srcdir)/keytest.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keytest.Tpo" "$(DEPDIR)/libelektra_a-keytest.Po"; else rm -f "$(DEPDIR)/libelektra_a-keytest.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keytest.obj -MD -MP -MF $(DEPDIR)/libelektra_a-keytest.Tpo -c -o libelektra_a-keytest.obj `if test -f 'keytest.c'; then $(CYGPATH_W) 'keytest.c'; else $(CYGPATH_W) '$(srcdir)/keytest.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keytest.Tpo $(DEPDIR)/libelektra_a-keytest.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keytest.c' object='libelektra_a-keytest.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keytest.obj `if test -f 'keytest.c'; then $(CYGPATH_W) 'keytest.c'; else $(CYGPATH_W) '$(srcdir)/keytest.c'; fi` + + libelektra_a-keyvalue.o: keyvalue.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyvalue.o -MD -MP -MF "$(DEPDIR)/libelektra_a-keyvalue.Tpo" -c -o libelektra_a-keyvalue.o `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyvalue.Tpo" "$(DEPDIR)/libelektra_a-keyvalue.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyvalue.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyvalue.o -MD -MP -MF $(DEPDIR)/libelektra_a-keyvalue.Tpo -c -o libelektra_a-keyvalue.o `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyvalue.Tpo $(DEPDIR)/libelektra_a-keyvalue.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyvalue.c' object='libelektra_a-keyvalue.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyvalue.o `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c + + libelektra_a-keyvalue.obj: keyvalue.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyvalue.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-keyvalue.Tpo" -c -o libelektra_a-keyvalue.obj `if test -f 'keyvalue.c'; then $(CYGPATH_W) 'keyvalue.c'; else $(CYGPATH_W) '$(srcdir)/keyvalue.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-keyvalue.Tpo" "$(DEPDIR)/libelektra_a-keyvalue.Po"; else rm -f "$(DEPDIR)/libelektra_a-keyvalue.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-keyvalue.obj -MD -MP -MF $(DEPDIR)/libelektra_a-keyvalue.Tpo -c -o libelektra_a-keyvalue.obj `if test -f 'keyvalue.c'; then $(CYGPATH_W) 'keyvalue.c'; else $(CYGPATH_W) '$(srcdir)/keyvalue.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-keyvalue.Tpo $(DEPDIR)/libelektra_a-keyvalue.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyvalue.c' object='libelektra_a-keyvalue.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-keyvalue.obj `if test -f 'keyvalue.c'; then $(CYGPATH_W) 'keyvalue.c'; else $(CYGPATH_W) '$(srcdir)/keyvalue.c'; fi` + + libelektra_a-serialize.o: serialize.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-serialize.o -MD -MP -MF "$(DEPDIR)/libelektra_a-serialize.Tpo" -c -o libelektra_a-serialize.o `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-serialize.Tpo" "$(DEPDIR)/libelektra_a-serialize.Po"; else rm -f "$(DEPDIR)/libelektra_a-serialize.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-serialize.o -MD -MP -MF $(DEPDIR)/libelektra_a-serialize.Tpo -c -o libelektra_a-serialize.o `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-serialize.Tpo $(DEPDIR)/libelektra_a-serialize.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serialize.c' object='libelektra_a-serialize.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-serialize.o `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c + + libelektra_a-serialize.obj: serialize.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-serialize.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-serialize.Tpo" -c -o libelektra_a-serialize.obj `if test -f 'serialize.c'; then $(CYGPATH_W) 'serialize.c'; else $(CYGPATH_W) '$(srcdir)/serialize.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-serialize.Tpo" "$(DEPDIR)/libelektra_a-serialize.Po"; else rm -f "$(DEPDIR)/libelektra_a-serialize.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-serialize.obj -MD -MP -MF $(DEPDIR)/libelektra_a-serialize.Tpo -c -o libelektra_a-serialize.obj `if test -f 'serialize.c'; then $(CYGPATH_W) 'serialize.c'; else $(CYGPATH_W) '$(srcdir)/serialize.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-serialize.Tpo $(DEPDIR)/libelektra_a-serialize.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serialize.c' object='libelektra_a-serialize.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-serialize.obj `if test -f 'serialize.c'; then $(CYGPATH_W) 'serialize.c'; else $(CYGPATH_W) '$(srcdir)/serialize.c'; fi` + + libelektra_a-split.o: split.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-split.o -MD -MP -MF "$(DEPDIR)/libelektra_a-split.Tpo" -c -o libelektra_a-split.o `test -f 'split.c' || echo '$(srcdir)/'`split.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-split.Tpo" "$(DEPDIR)/libelektra_a-split.Po"; else rm -f "$(DEPDIR)/libelektra_a-split.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-split.o -MD -MP -MF $(DEPDIR)/libelektra_a-split.Tpo -c -o libelektra_a-split.o `test -f 'split.c' || echo '$(srcdir)/'`split.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-split.Tpo $(DEPDIR)/libelektra_a-split.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='split.c' object='libelektra_a-split.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-split.o `test -f 'split.c' || echo '$(srcdir)/'`split.c + + libelektra_a-split.obj: split.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-split.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-split.Tpo" -c -o libelektra_a-split.obj `if test -f 'split.c'; then $(CYGPATH_W) 'split.c'; else $(CYGPATH_W) '$(srcdir)/split.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-split.Tpo" "$(DEPDIR)/libelektra_a-split.Po"; else rm -f "$(DEPDIR)/libelektra_a-split.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-split.obj -MD -MP -MF $(DEPDIR)/libelektra_a-split.Tpo -c -o libelektra_a-split.obj `if test -f 'split.c'; then $(CYGPATH_W) 'split.c'; else $(CYGPATH_W) '$(srcdir)/split.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-split.Tpo $(DEPDIR)/libelektra_a-split.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='split.c' object='libelektra_a-split.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-split.obj `if test -f 'split.c'; then $(CYGPATH_W) 'split.c'; else $(CYGPATH_W) '$(srcdir)/split.c'; fi` + + libelektra_a-exported_symbols.o: exported_symbols.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-exported_symbols.o -MD -MP -MF "$(DEPDIR)/libelektra_a-exported_symbols.Tpo" -c -o libelektra_a-exported_symbols.o `test -f 'exported_symbols.c' || echo '$(srcdir)/'`exported_symbols.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-exported_symbols.Tpo" "$(DEPDIR)/libelektra_a-exported_symbols.Po"; else rm -f "$(DEPDIR)/libelektra_a-exported_symbols.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-exported_symbols.o -MD -MP -MF $(DEPDIR)/libelektra_a-exported_symbols.Tpo -c -o libelektra_a-exported_symbols.o `test -f 'exported_symbols.c' || echo '$(srcdir)/'`exported_symbols.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-exported_symbols.Tpo $(DEPDIR)/libelektra_a-exported_symbols.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='exported_symbols.c' object='libelektra_a-exported_symbols.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-exported_symbols.o `test -f 'exported_symbols.c' || echo '$(srcdir)/'`exported_symbols.c + + libelektra_a-exported_symbols.obj: exported_symbols.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-exported_symbols.obj -MD -MP -MF "$(DEPDIR)/libelektra_a-exported_symbols.Tpo" -c -o libelektra_a-exported_symbols.obj `if test -f 'exported_symbols.c'; then $(CYGPATH_W) 'exported_symbols.c'; else $(CYGPATH_W) '$(srcdir)/exported_symbols.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_a-exported_symbols.Tpo" "$(DEPDIR)/libelektra_a-exported_symbols.Po"; else rm -f "$(DEPDIR)/libelektra_a-exported_symbols.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -MT libelektra_a-exported_symbols.obj -MD -MP -MF $(DEPDIR)/libelektra_a-exported_symbols.Tpo -c -o libelektra_a-exported_symbols.obj `if test -f 'exported_symbols.c'; then $(CYGPATH_W) 'exported_symbols.c'; else $(CYGPATH_W) '$(srcdir)/exported_symbols.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_a-exported_symbols.Tpo $(DEPDIR)/libelektra_a-exported_symbols.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='exported_symbols.c' object='libelektra_a-exported_symbols.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_a_CFLAGS) $(CFLAGS) -c -o libelektra_a-exported_symbols.obj `if test -f 'exported_symbols.c'; then $(CYGPATH_W) 'exported_symbols.c'; else $(CYGPATH_W) '$(srcdir)/exported_symbols.c'; fi` + + libelektra_la-kdb.lo: kdb.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdb.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-kdb.Tpo" -c -o libelektra_la-kdb.lo `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-kdb.Tpo" "$(DEPDIR)/libelektra_la-kdb.Plo"; else rm -f "$(DEPDIR)/libelektra_la-kdb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdb.lo -MD -MP -MF $(DEPDIR)/libelektra_la-kdb.Tpo -c -o libelektra_la-kdb.lo `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-kdb.Tpo $(DEPDIR)/libelektra_la-kdb.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdb.c' object='libelektra_la-kdb.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdb.lo `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdb.lo `test -f 'kdb.c' || echo '$(srcdir)/'`kdb.c + + libelektra_la-kdbhandle.lo: kdbhandle.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdbhandle.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-kdbhandle.Tpo" -c -o libelektra_la-kdbhandle.lo `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-kdbhandle.Tpo" "$(DEPDIR)/libelektra_la-kdbhandle.Plo"; else rm -f "$(DEPDIR)/libelektra_la-kdbhandle.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdbhandle.lo -MD -MP -MF $(DEPDIR)/libelektra_la-kdbhandle.Tpo -c -o libelektra_la-kdbhandle.lo `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-kdbhandle.Tpo $(DEPDIR)/libelektra_la-kdbhandle.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbhandle.c' object='libelektra_la-kdbhandle.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdbhandle.lo `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdbhandle.lo `test -f 'kdbhandle.c' || echo '$(srcdir)/'`kdbhandle.c + + libelektra_la-error.lo: error.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-error.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-error.Tpo" -c -o libelektra_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-error.Tpo" "$(DEPDIR)/libelektra_la-error.Plo"; else rm -f "$(DEPDIR)/libelektra_la-error.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-error.lo -MD -MP -MF $(DEPDIR)/libelektra_la-error.Tpo -c -o libelektra_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-error.Tpo $(DEPDIR)/libelektra_la-error.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='error.c' object='libelektra_la-error.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c + + libelektra_la-key.lo: key.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-key.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-key.Tpo" -c -o libelektra_la-key.lo `test -f 'key.c' || echo '$(srcdir)/'`key.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-key.Tpo" "$(DEPDIR)/libelektra_la-key.Plo"; else rm -f "$(DEPDIR)/libelektra_la-key.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-key.lo -MD -MP -MF $(DEPDIR)/libelektra_la-key.Tpo -c -o libelektra_la-key.lo `test -f 'key.c' || echo '$(srcdir)/'`key.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-key.Tpo $(DEPDIR)/libelektra_la-key.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='key.c' object='libelektra_la-key.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-key.lo `test -f 'key.c' || echo '$(srcdir)/'`key.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-key.lo `test -f 'key.c' || echo '$(srcdir)/'`key.c + + libelektra_la-keyset.lo: keyset.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyset.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-keyset.Tpo" -c -o libelektra_la-keyset.lo `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-keyset.Tpo" "$(DEPDIR)/libelektra_la-keyset.Plo"; else rm -f "$(DEPDIR)/libelektra_la-keyset.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyset.lo -MD -MP -MF $(DEPDIR)/libelektra_la-keyset.Tpo -c -o libelektra_la-keyset.lo `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-keyset.Tpo $(DEPDIR)/libelektra_la-keyset.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyset.c' object='libelektra_la-keyset.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyset.lo `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyset.lo `test -f 'keyset.c' || echo '$(srcdir)/'`keyset.c + + libelektra_la-trie.lo: trie.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-trie.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-trie.Tpo" -c -o libelektra_la-trie.lo `test -f 'trie.c' || echo '$(srcdir)/'`trie.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-trie.Tpo" "$(DEPDIR)/libelektra_la-trie.Plo"; else rm -f "$(DEPDIR)/libelektra_la-trie.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-trie.lo -MD -MP -MF $(DEPDIR)/libelektra_la-trie.Tpo -c -o libelektra_la-trie.lo `test -f 'trie.c' || echo '$(srcdir)/'`trie.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-trie.Tpo $(DEPDIR)/libelektra_la-trie.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trie.c' object='libelektra_la-trie.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-trie.lo `test -f 'trie.c' || echo '$(srcdir)/'`trie.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-trie.lo `test -f 'trie.c' || echo '$(srcdir)/'`trie.c + + libelektra_la-kdbhighlevel.lo: kdbhighlevel.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdbhighlevel.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-kdbhighlevel.Tpo" -c -o libelektra_la-kdbhighlevel.lo `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-kdbhighlevel.Tpo" "$(DEPDIR)/libelektra_la-kdbhighlevel.Plo"; else rm -f "$(DEPDIR)/libelektra_la-kdbhighlevel.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdbhighlevel.lo -MD -MP -MF $(DEPDIR)/libelektra_la-kdbhighlevel.Tpo -c -o libelektra_la-kdbhighlevel.lo `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-kdbhighlevel.Tpo $(DEPDIR)/libelektra_la-kdbhighlevel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbhighlevel.c' object='libelektra_la-kdbhighlevel.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdbhighlevel.lo `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdbhighlevel.lo `test -f 'kdbhighlevel.c' || echo '$(srcdir)/'`kdbhighlevel.c + + libelektra_la-kdbcapability.lo: kdbcapability.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdbcapability.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-kdbcapability.Tpo" -c -o libelektra_la-kdbcapability.lo `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-kdbcapability.Tpo" "$(DEPDIR)/libelektra_la-kdbcapability.Plo"; else rm -f "$(DEPDIR)/libelektra_la-kdbcapability.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-kdbcapability.lo -MD -MP -MF $(DEPDIR)/libelektra_la-kdbcapability.Tpo -c -o libelektra_la-kdbcapability.lo `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-kdbcapability.Tpo $(DEPDIR)/libelektra_la-kdbcapability.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbcapability.c' object='libelektra_la-kdbcapability.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdbcapability.lo `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-kdbcapability.lo `test -f 'kdbcapability.c' || echo '$(srcdir)/'`kdbcapability.c + + libelektra_la-keyhelpers.lo: keyhelpers.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyhelpers.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-keyhelpers.Tpo" -c -o libelektra_la-keyhelpers.lo `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-keyhelpers.Tpo" "$(DEPDIR)/libelektra_la-keyhelpers.Plo"; else rm -f "$(DEPDIR)/libelektra_la-keyhelpers.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyhelpers.lo -MD -MP -MF $(DEPDIR)/libelektra_la-keyhelpers.Tpo -c -o libelektra_la-keyhelpers.lo `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-keyhelpers.Tpo $(DEPDIR)/libelektra_la-keyhelpers.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyhelpers.c' object='libelektra_la-keyhelpers.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyhelpers.lo `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyhelpers.lo `test -f 'keyhelpers.c' || echo '$(srcdir)/'`keyhelpers.c + + libelektra_la-keymeta.lo: keymeta.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keymeta.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-keymeta.Tpo" -c -o libelektra_la-keymeta.lo `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-keymeta.Tpo" "$(DEPDIR)/libelektra_la-keymeta.Plo"; else rm -f "$(DEPDIR)/libelektra_la-keymeta.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keymeta.lo -MD -MP -MF $(DEPDIR)/libelektra_la-keymeta.Tpo -c -o libelektra_la-keymeta.lo `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-keymeta.Tpo $(DEPDIR)/libelektra_la-keymeta.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keymeta.c' object='libelektra_la-keymeta.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keymeta.lo `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keymeta.lo `test -f 'keymeta.c' || echo '$(srcdir)/'`keymeta.c + + libelektra_la-keyname.lo: keyname.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyname.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-keyname.Tpo" -c -o libelektra_la-keyname.lo `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-keyname.Tpo" "$(DEPDIR)/libelektra_la-keyname.Plo"; else rm -f "$(DEPDIR)/libelektra_la-keyname.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyname.lo -MD -MP -MF $(DEPDIR)/libelektra_la-keyname.Tpo -c -o libelektra_la-keyname.lo `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-keyname.Tpo $(DEPDIR)/libelektra_la-keyname.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyname.c' object='libelektra_la-keyname.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyname.lo `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyname.lo `test -f 'keyname.c' || echo '$(srcdir)/'`keyname.c + + libelektra_la-keytest.lo: keytest.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keytest.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-keytest.Tpo" -c -o libelektra_la-keytest.lo `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-keytest.Tpo" "$(DEPDIR)/libelektra_la-keytest.Plo"; else rm -f "$(DEPDIR)/libelektra_la-keytest.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keytest.lo -MD -MP -MF $(DEPDIR)/libelektra_la-keytest.Tpo -c -o libelektra_la-keytest.lo `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-keytest.Tpo $(DEPDIR)/libelektra_la-keytest.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keytest.c' object='libelektra_la-keytest.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keytest.lo `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keytest.lo `test -f 'keytest.c' || echo '$(srcdir)/'`keytest.c + + libelektra_la-keyvalue.lo: keyvalue.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyvalue.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-keyvalue.Tpo" -c -o libelektra_la-keyvalue.lo `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-keyvalue.Tpo" "$(DEPDIR)/libelektra_la-keyvalue.Plo"; else rm -f "$(DEPDIR)/libelektra_la-keyvalue.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-keyvalue.lo -MD -MP -MF $(DEPDIR)/libelektra_la-keyvalue.Tpo -c -o libelektra_la-keyvalue.lo `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-keyvalue.Tpo $(DEPDIR)/libelektra_la-keyvalue.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyvalue.c' object='libelektra_la-keyvalue.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyvalue.lo `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-keyvalue.lo `test -f 'keyvalue.c' || echo '$(srcdir)/'`keyvalue.c + + libelektra_la-serialize.lo: serialize.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-serialize.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-serialize.Tpo" -c -o libelektra_la-serialize.lo `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-serialize.Tpo" "$(DEPDIR)/libelektra_la-serialize.Plo"; else rm -f "$(DEPDIR)/libelektra_la-serialize.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-serialize.lo -MD -MP -MF $(DEPDIR)/libelektra_la-serialize.Tpo -c -o libelektra_la-serialize.lo `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-serialize.Tpo $(DEPDIR)/libelektra_la-serialize.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='serialize.c' object='libelektra_la-serialize.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-serialize.lo `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-serialize.lo `test -f 'serialize.c' || echo '$(srcdir)/'`serialize.c + + libelektra_la-split.lo: split.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-split.lo -MD -MP -MF "$(DEPDIR)/libelektra_la-split.Tpo" -c -o libelektra_la-split.lo `test -f 'split.c' || echo '$(srcdir)/'`split.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektra_la-split.Tpo" "$(DEPDIR)/libelektra_la-split.Plo"; else rm -f "$(DEPDIR)/libelektra_la-split.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -MT libelektra_la-split.lo -MD -MP -MF $(DEPDIR)/libelektra_la-split.Tpo -c -o libelektra_la-split.lo `test -f 'split.c' || echo '$(srcdir)/'`split.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektra_la-split.Tpo $(DEPDIR)/libelektra_la-split.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='split.c' object='libelektra_la-split.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-split.lo `test -f 'split.c' || echo '$(srcdir)/'`split.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektra_la_CFLAGS) $(CFLAGS) -c -o libelektra_la-split.lo `test -f 'split.c' || echo '$(srcdir)/'`split.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -802,17 +790,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -824,8 +808,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -835,13 +819,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -855,22 +838,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -887,7 +869,7 @@ check: $(BUILT_SOURCES) + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +@@ -924,7 +906,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -938,12 +920,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libLIBRARIES install-libLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -964,22 +954,25 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLIBRARIES \ +- uninstall-libLTLIBRARIES ++uninstall-am: uninstall-libLIBRARIES uninstall-libLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \ + clean-local 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-exec install-exec-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-libLIBRARIES \ +- install-libLTLIBRARIES install-man install-strip installcheck \ ++ install-libLTLIBRARIES 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-info-am \ +- uninstall-libLIBRARIES uninstall-libLTLIBRARIES ++ tags uninstall uninstall-am uninstall-libLIBRARIES \ ++ uninstall-libLTLIBRARIES + + + ../include/kdbprivate.h: +Index: elektra-0.7.0rc5/src/libelektratools/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/libelektratools/Makefile.in ++++ elektra-0.7.0rc5/src/libelektratools/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -20,13 +20,10 @@ + # -- Yannick + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -45,8 +42,7 @@ target_triplet = @target@ + subdir = src/libelektratools + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -72,38 +68,38 @@ am__libelektratools_a_SOURCES_DIST = kdb + libelektratools_a_OBJECTS = $(am_libelektratools_a_OBJECTS) + ulibLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(ulib_LTLIBRARIES) +-am__DEPENDENCIES_1 = + @HAVE_XML_TRUE@libelektratools_la_DEPENDENCIES = \ +-@HAVE_XML_TRUE@ ../libelektra/libelektra.la \ +-@HAVE_XML_TRUE@ $(am__DEPENDENCIES_1) ++@HAVE_XML_TRUE@ ../libelektra/libelektra.la + am__libelektratools_la_SOURCES_DIST = kdbtools.c stream.c \ + ../include/kdbtools.h ../include/kdbprivate.h ../include/kdb.h + @HAVE_XML_TRUE@am__objects_2 = libelektratools_la-kdbtools.lo \ + @HAVE_XML_TRUE@ libelektratools_la-stream.lo + @HAVE_XML_TRUE@am_libelektratools_la_OBJECTS = $(am__objects_2) + libelektratools_la_OBJECTS = $(am_libelektratools_la_OBJECTS) ++libelektratools_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libelektratools_la_CFLAGS) $(CFLAGS) \ ++ $(libelektratools_la_LDFLAGS) $(LDFLAGS) -o $@ + @HAVE_XML_TRUE@am_libelektratools_la_rpath = -rpath $(ulibdir) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libelektratools_a_SOURCES) $(libelektratools_la_SOURCES) + DIST_SOURCES = $(am__libelektratools_a_SOURCES_DIST) \ + $(am__libelektratools_la_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -129,8 +125,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -141,20 +135,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -176,6 +161,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -191,25 +177,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -223,6 +205,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -233,7 +216,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -249,6 +231,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -262,6 +246,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -269,6 +254,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + @HAVE_XML_TRUE@AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \ +@@ -318,7 +305,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-ulibLIBRARIES: $(ulib_LIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(ulibdir)" || $(mkdir_p) "$(DESTDIR)$(ulibdir)" ++ test -z "$(ulibdir)" || $(MKDIR_P) "$(DESTDIR)$(ulibdir)" + @list='$(ulib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -351,21 +338,21 @@ libelektratools.a: $(libelektratools_a_O + $(RANLIB) libelektratools.a + install-ulibLTLIBRARIES: $(ulib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(ulibdir)" || $(mkdir_p) "$(DESTDIR)$(ulibdir)" ++ test -z "$(ulibdir)" || $(MKDIR_P) "$(DESTDIR)$(ulibdir)" + @list='$(ulib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(ulibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ulibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(ulibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ulibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ulibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ulibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ulibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ulibdir)/$$f"; \ + else :; fi; \ + done + + uninstall-ulibLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(ulib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(ulib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(ulibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(ulibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ulibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ulibdir)/$$p"; \ + done + + clean-ulibLTLIBRARIES: +@@ -377,7 +364,7 @@ clean-ulibLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libelektratools.la: $(libelektratools_la_OBJECTS) $(libelektratools_la_DEPENDENCIES) +- $(LINK) $(am_libelektratools_la_rpath) $(libelektratools_la_LDFLAGS) $(libelektratools_la_OBJECTS) $(libelektratools_la_LIBADD) $(LIBS) ++ $(libelektratools_la_LINK) $(am_libelektratools_la_rpath) $(libelektratools_la_OBJECTS) $(libelektratools_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -391,67 +378,67 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libelektratools_la-stream.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libelektratools_a-kdbtools.o: kdbtools.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-kdbtools.o -MD -MP -MF "$(DEPDIR)/libelektratools_a-kdbtools.Tpo" -c -o libelektratools_a-kdbtools.o `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektratools_a-kdbtools.Tpo" "$(DEPDIR)/libelektratools_a-kdbtools.Po"; else rm -f "$(DEPDIR)/libelektratools_a-kdbtools.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-kdbtools.o -MD -MP -MF $(DEPDIR)/libelektratools_a-kdbtools.Tpo -c -o libelektratools_a-kdbtools.o `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektratools_a-kdbtools.Tpo $(DEPDIR)/libelektratools_a-kdbtools.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbtools.c' object='libelektratools_a-kdbtools.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -c -o libelektratools_a-kdbtools.o `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c + + libelektratools_a-kdbtools.obj: kdbtools.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-kdbtools.obj -MD -MP -MF "$(DEPDIR)/libelektratools_a-kdbtools.Tpo" -c -o libelektratools_a-kdbtools.obj `if test -f 'kdbtools.c'; then $(CYGPATH_W) 'kdbtools.c'; else $(CYGPATH_W) '$(srcdir)/kdbtools.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektratools_a-kdbtools.Tpo" "$(DEPDIR)/libelektratools_a-kdbtools.Po"; else rm -f "$(DEPDIR)/libelektratools_a-kdbtools.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-kdbtools.obj -MD -MP -MF $(DEPDIR)/libelektratools_a-kdbtools.Tpo -c -o libelektratools_a-kdbtools.obj `if test -f 'kdbtools.c'; then $(CYGPATH_W) 'kdbtools.c'; else $(CYGPATH_W) '$(srcdir)/kdbtools.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektratools_a-kdbtools.Tpo $(DEPDIR)/libelektratools_a-kdbtools.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbtools.c' object='libelektratools_a-kdbtools.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -c -o libelektratools_a-kdbtools.obj `if test -f 'kdbtools.c'; then $(CYGPATH_W) 'kdbtools.c'; else $(CYGPATH_W) '$(srcdir)/kdbtools.c'; fi` + + libelektratools_a-stream.o: stream.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-stream.o -MD -MP -MF "$(DEPDIR)/libelektratools_a-stream.Tpo" -c -o libelektratools_a-stream.o `test -f 'stream.c' || echo '$(srcdir)/'`stream.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektratools_a-stream.Tpo" "$(DEPDIR)/libelektratools_a-stream.Po"; else rm -f "$(DEPDIR)/libelektratools_a-stream.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-stream.o -MD -MP -MF $(DEPDIR)/libelektratools_a-stream.Tpo -c -o libelektratools_a-stream.o `test -f 'stream.c' || echo '$(srcdir)/'`stream.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektratools_a-stream.Tpo $(DEPDIR)/libelektratools_a-stream.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stream.c' object='libelektratools_a-stream.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -c -o libelektratools_a-stream.o `test -f 'stream.c' || echo '$(srcdir)/'`stream.c + + libelektratools_a-stream.obj: stream.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-stream.obj -MD -MP -MF "$(DEPDIR)/libelektratools_a-stream.Tpo" -c -o libelektratools_a-stream.obj `if test -f 'stream.c'; then $(CYGPATH_W) 'stream.c'; else $(CYGPATH_W) '$(srcdir)/stream.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektratools_a-stream.Tpo" "$(DEPDIR)/libelektratools_a-stream.Po"; else rm -f "$(DEPDIR)/libelektratools_a-stream.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -MT libelektratools_a-stream.obj -MD -MP -MF $(DEPDIR)/libelektratools_a-stream.Tpo -c -o libelektratools_a-stream.obj `if test -f 'stream.c'; then $(CYGPATH_W) 'stream.c'; else $(CYGPATH_W) '$(srcdir)/stream.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektratools_a-stream.Tpo $(DEPDIR)/libelektratools_a-stream.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stream.c' object='libelektratools_a-stream.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_a_CFLAGS) $(CFLAGS) -c -o libelektratools_a-stream.obj `if test -f 'stream.c'; then $(CYGPATH_W) 'stream.c'; else $(CYGPATH_W) '$(srcdir)/stream.c'; fi` + + libelektratools_la-kdbtools.lo: kdbtools.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -MT libelektratools_la-kdbtools.lo -MD -MP -MF "$(DEPDIR)/libelektratools_la-kdbtools.Tpo" -c -o libelektratools_la-kdbtools.lo `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektratools_la-kdbtools.Tpo" "$(DEPDIR)/libelektratools_la-kdbtools.Plo"; else rm -f "$(DEPDIR)/libelektratools_la-kdbtools.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -MT libelektratools_la-kdbtools.lo -MD -MP -MF $(DEPDIR)/libelektratools_la-kdbtools.Tpo -c -o libelektratools_la-kdbtools.lo `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektratools_la-kdbtools.Tpo $(DEPDIR)/libelektratools_la-kdbtools.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbtools.c' object='libelektratools_la-kdbtools.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -c -o libelektratools_la-kdbtools.lo `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -c -o libelektratools_la-kdbtools.lo `test -f 'kdbtools.c' || echo '$(srcdir)/'`kdbtools.c + + libelektratools_la-stream.lo: stream.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -MT libelektratools_la-stream.lo -MD -MP -MF "$(DEPDIR)/libelektratools_la-stream.Tpo" -c -o libelektratools_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libelektratools_la-stream.Tpo" "$(DEPDIR)/libelektratools_la-stream.Plo"; else rm -f "$(DEPDIR)/libelektratools_la-stream.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -MT libelektratools_la-stream.lo -MD -MP -MF $(DEPDIR)/libelektratools_la-stream.Tpo -c -o libelektratools_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libelektratools_la-stream.Tpo $(DEPDIR)/libelektratools_la-stream.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stream.c' object='libelektratools_la-stream.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -c -o libelektratools_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libelektratools_la_CFLAGS) $(CFLAGS) -c -o libelektratools_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -459,17 +446,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -481,8 +464,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -492,13 +475,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -512,22 +494,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -543,7 +524,7 @@ check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(ulibdir)" "$(DESTDIR)$(ulibdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -579,7 +560,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -593,12 +574,20 @@ info-am: + + install-data-am: install-ulibLIBRARIES install-ulibLTLIBRARIES + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -619,22 +608,25 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-ulibLIBRARIES \ +- uninstall-ulibLTLIBRARIES ++uninstall-am: uninstall-ulibLIBRARIES uninstall-ulibLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-local clean-ulibLIBRARIES \ + clean-ulibLTLIBRARIES 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-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ 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 \ + install-ulibLIBRARIES install-ulibLTLIBRARIES 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-info-am \ +- uninstall-ulibLIBRARIES uninstall-ulibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-ulibLIBRARIES \ ++ uninstall-ulibLTLIBRARIES + + + @HAVE_XML_TRUE@clean-local: +Index: elektra-0.7.0rc5/src/libhelper/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/libhelper/Makefile.in ++++ elektra-0.7.0rc5/src/libhelper/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,13 +15,10 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,8 +37,7 @@ target_triplet = @target@ + subdir = src/libhelper + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -61,17 +57,22 @@ am__objects_2 = libhelper_dynamic_la-int + libhelper_dynamic_la-helper.lo + am_libhelper_dynamic_la_OBJECTS = $(am__objects_2) + libhelper_dynamic_la_OBJECTS = $(am_libhelper_dynamic_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libhelper_dynamic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libhelper_static_a_SOURCES) \ + $(libhelper_dynamic_la_SOURCES) + DIST_SOURCES = $(libhelper_static_a_SOURCES) \ +@@ -79,10 +80,7 @@ DIST_SOURCES = $(libhelper_static_a_SOUR + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -108,8 +106,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -120,20 +116,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -155,6 +142,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -170,25 +158,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -202,6 +186,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -212,7 +197,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -228,6 +212,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -241,6 +227,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -248,6 +235,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include +@@ -308,7 +297,7 @@ clean-noinstLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libhelper-dynamic.la: $(libhelper_dynamic_la_OBJECTS) $(libhelper_dynamic_la_DEPENDENCIES) +- $(LINK) $(libhelper_dynamic_la_LDFLAGS) $(libhelper_dynamic_la_OBJECTS) $(libhelper_dynamic_la_LIBADD) $(LIBS) ++ $(libhelper_dynamic_la_LINK) $(libhelper_dynamic_la_OBJECTS) $(libhelper_dynamic_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -322,67 +311,67 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhelper_static_a-internal.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libhelper_static_a-internal.o: internal.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-internal.o -MD -MP -MF "$(DEPDIR)/libhelper_static_a-internal.Tpo" -c -o libhelper_static_a-internal.o `test -f 'internal.c' || echo '$(srcdir)/'`internal.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libhelper_static_a-internal.Tpo" "$(DEPDIR)/libhelper_static_a-internal.Po"; else rm -f "$(DEPDIR)/libhelper_static_a-internal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-internal.o -MD -MP -MF $(DEPDIR)/libhelper_static_a-internal.Tpo -c -o libhelper_static_a-internal.o `test -f 'internal.c' || echo '$(srcdir)/'`internal.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libhelper_static_a-internal.Tpo $(DEPDIR)/libhelper_static_a-internal.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='internal.c' object='libhelper_static_a-internal.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -c -o libhelper_static_a-internal.o `test -f 'internal.c' || echo '$(srcdir)/'`internal.c + + libhelper_static_a-internal.obj: internal.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-internal.obj -MD -MP -MF "$(DEPDIR)/libhelper_static_a-internal.Tpo" -c -o libhelper_static_a-internal.obj `if test -f 'internal.c'; then $(CYGPATH_W) 'internal.c'; else $(CYGPATH_W) '$(srcdir)/internal.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libhelper_static_a-internal.Tpo" "$(DEPDIR)/libhelper_static_a-internal.Po"; else rm -f "$(DEPDIR)/libhelper_static_a-internal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-internal.obj -MD -MP -MF $(DEPDIR)/libhelper_static_a-internal.Tpo -c -o libhelper_static_a-internal.obj `if test -f 'internal.c'; then $(CYGPATH_W) 'internal.c'; else $(CYGPATH_W) '$(srcdir)/internal.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libhelper_static_a-internal.Tpo $(DEPDIR)/libhelper_static_a-internal.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='internal.c' object='libhelper_static_a-internal.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -c -o libhelper_static_a-internal.obj `if test -f 'internal.c'; then $(CYGPATH_W) 'internal.c'; else $(CYGPATH_W) '$(srcdir)/internal.c'; fi` + + libhelper_static_a-helper.o: helper.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-helper.o -MD -MP -MF "$(DEPDIR)/libhelper_static_a-helper.Tpo" -c -o libhelper_static_a-helper.o `test -f 'helper.c' || echo '$(srcdir)/'`helper.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libhelper_static_a-helper.Tpo" "$(DEPDIR)/libhelper_static_a-helper.Po"; else rm -f "$(DEPDIR)/libhelper_static_a-helper.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-helper.o -MD -MP -MF $(DEPDIR)/libhelper_static_a-helper.Tpo -c -o libhelper_static_a-helper.o `test -f 'helper.c' || echo '$(srcdir)/'`helper.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libhelper_static_a-helper.Tpo $(DEPDIR)/libhelper_static_a-helper.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='helper.c' object='libhelper_static_a-helper.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -c -o libhelper_static_a-helper.o `test -f 'helper.c' || echo '$(srcdir)/'`helper.c + + libhelper_static_a-helper.obj: helper.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-helper.obj -MD -MP -MF "$(DEPDIR)/libhelper_static_a-helper.Tpo" -c -o libhelper_static_a-helper.obj `if test -f 'helper.c'; then $(CYGPATH_W) 'helper.c'; else $(CYGPATH_W) '$(srcdir)/helper.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libhelper_static_a-helper.Tpo" "$(DEPDIR)/libhelper_static_a-helper.Po"; else rm -f "$(DEPDIR)/libhelper_static_a-helper.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -MT libhelper_static_a-helper.obj -MD -MP -MF $(DEPDIR)/libhelper_static_a-helper.Tpo -c -o libhelper_static_a-helper.obj `if test -f 'helper.c'; then $(CYGPATH_W) 'helper.c'; else $(CYGPATH_W) '$(srcdir)/helper.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libhelper_static_a-helper.Tpo $(DEPDIR)/libhelper_static_a-helper.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='helper.c' object='libhelper_static_a-helper.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_static_a_CFLAGS) $(CFLAGS) -c -o libhelper_static_a-helper.obj `if test -f 'helper.c'; then $(CYGPATH_W) 'helper.c'; else $(CYGPATH_W) '$(srcdir)/helper.c'; fi` + + libhelper_dynamic_la-internal.lo: internal.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -MT libhelper_dynamic_la-internal.lo -MD -MP -MF "$(DEPDIR)/libhelper_dynamic_la-internal.Tpo" -c -o libhelper_dynamic_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libhelper_dynamic_la-internal.Tpo" "$(DEPDIR)/libhelper_dynamic_la-internal.Plo"; else rm -f "$(DEPDIR)/libhelper_dynamic_la-internal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -MT libhelper_dynamic_la-internal.lo -MD -MP -MF $(DEPDIR)/libhelper_dynamic_la-internal.Tpo -c -o libhelper_dynamic_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libhelper_dynamic_la-internal.Tpo $(DEPDIR)/libhelper_dynamic_la-internal.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='internal.c' object='libhelper_dynamic_la-internal.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -c -o libhelper_dynamic_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -c -o libhelper_dynamic_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c + + libhelper_dynamic_la-helper.lo: helper.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -MT libhelper_dynamic_la-helper.lo -MD -MP -MF "$(DEPDIR)/libhelper_dynamic_la-helper.Tpo" -c -o libhelper_dynamic_la-helper.lo `test -f 'helper.c' || echo '$(srcdir)/'`helper.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libhelper_dynamic_la-helper.Tpo" "$(DEPDIR)/libhelper_dynamic_la-helper.Plo"; else rm -f "$(DEPDIR)/libhelper_dynamic_la-helper.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -MT libhelper_dynamic_la-helper.lo -MD -MP -MF $(DEPDIR)/libhelper_dynamic_la-helper.Tpo -c -o libhelper_dynamic_la-helper.lo `test -f 'helper.c' || echo '$(srcdir)/'`helper.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libhelper_dynamic_la-helper.Tpo $(DEPDIR)/libhelper_dynamic_la-helper.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='helper.c' object='libhelper_dynamic_la-helper.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -c -o libhelper_dynamic_la-helper.lo `test -f 'helper.c' || echo '$(srcdir)/'`helper.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhelper_dynamic_la_CFLAGS) $(CFLAGS) -c -o libhelper_dynamic_la-helper.lo `test -f 'helper.c' || echo '$(srcdir)/'`helper.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -390,17 +379,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -412,8 +397,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -423,13 +408,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -443,22 +427,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -506,7 +489,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -520,12 +503,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -546,19 +537,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-local clean-noinstLIBRARIES \ + clean-noinstLTLIBRARIES 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-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ 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-info-am ++ tags uninstall uninstall-am + + + clean-local: +Index: elektra-0.7.0rc5/src/libloader/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/libloader/Makefile.in ++++ elektra-0.7.0rc5/src/libloader/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,13 +17,10 @@ + # $Id$ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,8 +39,7 @@ target_triplet = @target@ + subdir = src/libloader + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -61,17 +57,22 @@ am__DEPENDENCIES_1 = + am_libloader_dynamic_la_OBJECTS = \ + libloader_dynamic_la-kdbLibLoader.lo + libloader_dynamic_la_OBJECTS = $(am_libloader_dynamic_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++libloader_dynamic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libloader_dynamic_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libloader_static_a_SOURCES) \ + $(libloader_dynamic_la_SOURCES) + DIST_SOURCES = $(libloader_static_a_SOURCES) \ +@@ -79,10 +80,7 @@ DIST_SOURCES = $(libloader_static_a_SOUR + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -108,8 +106,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -120,20 +116,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -155,6 +142,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -170,25 +158,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -202,6 +186,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -212,7 +197,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -228,6 +212,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -241,6 +227,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -248,6 +235,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL)\ +@@ -311,7 +300,7 @@ clean-noinstLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libloader-dynamic.la: $(libloader_dynamic_la_OBJECTS) $(libloader_dynamic_la_DEPENDENCIES) +- $(LINK) $(libloader_dynamic_la_LDFLAGS) $(libloader_dynamic_la_OBJECTS) $(libloader_dynamic_la_LIBADD) $(LIBS) ++ $(libloader_dynamic_la_LINK) $(libloader_dynamic_la_OBJECTS) $(libloader_dynamic_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -323,46 +312,46 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libloader_static_a-kdbLibLoader.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libloader_static_a-kdbLibLoader.o: kdbLibLoader.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_static_a_CFLAGS) $(CFLAGS) -MT libloader_static_a-kdbLibLoader.o -MD -MP -MF "$(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo" -c -o libloader_static_a-kdbLibLoader.o `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo" "$(DEPDIR)/libloader_static_a-kdbLibLoader.Po"; else rm -f "$(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_static_a_CFLAGS) $(CFLAGS) -MT libloader_static_a-kdbLibLoader.o -MD -MP -MF $(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo -c -o libloader_static_a-kdbLibLoader.o `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo $(DEPDIR)/libloader_static_a-kdbLibLoader.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbLibLoader.c' object='libloader_static_a-kdbLibLoader.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_static_a_CFLAGS) $(CFLAGS) -c -o libloader_static_a-kdbLibLoader.o `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c + + libloader_static_a-kdbLibLoader.obj: kdbLibLoader.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_static_a_CFLAGS) $(CFLAGS) -MT libloader_static_a-kdbLibLoader.obj -MD -MP -MF "$(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo" -c -o libloader_static_a-kdbLibLoader.obj `if test -f 'kdbLibLoader.c'; then $(CYGPATH_W) 'kdbLibLoader.c'; else $(CYGPATH_W) '$(srcdir)/kdbLibLoader.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo" "$(DEPDIR)/libloader_static_a-kdbLibLoader.Po"; else rm -f "$(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_static_a_CFLAGS) $(CFLAGS) -MT libloader_static_a-kdbLibLoader.obj -MD -MP -MF $(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo -c -o libloader_static_a-kdbLibLoader.obj `if test -f 'kdbLibLoader.c'; then $(CYGPATH_W) 'kdbLibLoader.c'; else $(CYGPATH_W) '$(srcdir)/kdbLibLoader.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libloader_static_a-kdbLibLoader.Tpo $(DEPDIR)/libloader_static_a-kdbLibLoader.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbLibLoader.c' object='libloader_static_a-kdbLibLoader.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_static_a_CFLAGS) $(CFLAGS) -c -o libloader_static_a-kdbLibLoader.obj `if test -f 'kdbLibLoader.c'; then $(CYGPATH_W) 'kdbLibLoader.c'; else $(CYGPATH_W) '$(srcdir)/kdbLibLoader.c'; fi` + + libloader_dynamic_la-kdbLibLoader.lo: kdbLibLoader.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_dynamic_la_CFLAGS) $(CFLAGS) -MT libloader_dynamic_la-kdbLibLoader.lo -MD -MP -MF "$(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Tpo" -c -o libloader_dynamic_la-kdbLibLoader.lo `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Tpo" "$(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Plo"; else rm -f "$(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_dynamic_la_CFLAGS) $(CFLAGS) -MT libloader_dynamic_la-kdbLibLoader.lo -MD -MP -MF $(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Tpo -c -o libloader_dynamic_la-kdbLibLoader.lo `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Tpo $(DEPDIR)/libloader_dynamic_la-kdbLibLoader.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdbLibLoader.c' object='libloader_dynamic_la-kdbLibLoader.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_dynamic_la_CFLAGS) $(CFLAGS) -c -o libloader_dynamic_la-kdbLibLoader.lo `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libloader_dynamic_la_CFLAGS) $(CFLAGS) -c -o libloader_dynamic_la-kdbLibLoader.lo `test -f 'kdbLibLoader.c' || echo '$(srcdir)/'`kdbLibLoader.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -370,17 +359,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -392,8 +377,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -403,13 +388,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -423,22 +407,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -486,7 +469,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -500,12 +483,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -526,19 +517,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-local clean-noinstLIBRARIES \ + clean-noinstLTLIBRARIES 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-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ 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-info-am ++ tags uninstall uninstall-am + + + clean-local: +Index: elektra-0.7.0rc5/src/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/Makefile.in ++++ elektra-0.7.0rc5/src/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,13 +13,10 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -38,8 +35,7 @@ target_triplet = @target@ + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -49,17 +45,17 @@ SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -85,8 +81,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -97,20 +91,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -132,6 +117,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -147,25 +133,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -179,6 +161,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -189,7 +172,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -205,6 +187,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -218,6 +202,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -225,6 +210,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + std_subdirs = include libloader libhelper libelektra backends kdb bindings preload +@@ -270,10 +257,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -305,8 +288,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -350,8 +332,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -376,8 +358,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -387,13 +369,12 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -407,22 +388,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -436,7 +416,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -444,6 +424,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -483,8 +465,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -498,12 +479,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -522,22 +511,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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 installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: elektra-0.7.0rc5/src/preload/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/src/preload/Makefile.in ++++ elektra-0.7.0rc5/src/preload/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,13 +14,10 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -36,17 +33,17 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-bin_PROGRAMS = preload$(EXEEXT) preload_static$(EXEEXT) ++bin_PROGRAMS = preload$(EXEEXT) $(am__EXEEXT_1) + subdir = src/preload + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/src/include/config.h + CONFIG_CLEAN_FILES = ++@ENABLE_STATIC_TRUE@am__EXEEXT_1 = preload_static$(EXEEXT) + am__installdirs = "$(DESTDIR)$(bindir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) +@@ -56,31 +53,38 @@ preload_OBJECTS = $(am_preload_OBJECTS) + am__DEPENDENCIES_1 = + preload_DEPENDENCIES = ../libelektra/libelektra.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++preload_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(preload_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++am__preload_static_SOURCES_DIST = preload.c ../include/kdb.h + am__objects_2 = preload_static-preload.$(OBJEXT) +-am_preload_static_OBJECTS = $(am__objects_2) ++@ENABLE_STATIC_TRUE@am_preload_static_OBJECTS = $(am__objects_2) + preload_static_OBJECTS = $(am_preload_static_OBJECTS) +-preload_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- ../libelektra/libelektra.a $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++@ENABLE_STATIC_TRUE@preload_static_DEPENDENCIES = \ ++@ENABLE_STATIC_TRUE@ $(am__DEPENDENCIES_1) \ ++@ENABLE_STATIC_TRUE@ ../libelektra/libelektra.a \ ++@ENABLE_STATIC_TRUE@ $(am__DEPENDENCIES_1) ++preload_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(preload_static_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(preload_SOURCES) $(preload_static_SOURCES) +-DIST_SOURCES = $(preload_SOURCES) $(preload_static_SOURCES) ++DIST_SOURCES = $(preload_SOURCES) $(am__preload_static_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -106,8 +110,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -118,20 +120,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -153,6 +146,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -168,25 +162,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -200,6 +190,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -210,7 +201,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -226,6 +216,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -239,6 +231,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -246,18 +239,22 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \ + -I$(top_srcdir)/src/include $(LTDLINCL) + + preload_source = preload.c ../include/kdb.h ++@ENABLE_STATIC_FALSE@PRELOAD_STATIC = ++@ENABLE_STATIC_TRUE@PRELOAD_STATIC = preload_static + preload_SOURCES = $(preload_source) + preload_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV) + preload_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) +-preload_static_SOURCES = $(preload_source) +-preload_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV) +-preload_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS) ++@ENABLE_STATIC_TRUE@preload_static_SOURCES = $(preload_source) ++@ENABLE_STATIC_TRUE@preload_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV) ++@ENABLE_STATIC_TRUE@preload_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS) + all: all-am + + .SUFFIXES: +@@ -293,15 +290,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -321,10 +318,10 @@ clean-binPROGRAMS: + done + preload$(EXEEXT): $(preload_OBJECTS) $(preload_DEPENDENCIES) + @rm -f preload$(EXEEXT) +- $(LINK) $(preload_LDFLAGS) $(preload_OBJECTS) $(preload_LDADD) $(LIBS) ++ $(preload_LINK) $(preload_OBJECTS) $(preload_LDADD) $(LIBS) + preload_static$(EXEEXT): $(preload_static_OBJECTS) $(preload_static_DEPENDENCIES) + @rm -f preload_static$(EXEEXT) +- $(LINK) $(preload_static_LDFLAGS) $(preload_static_OBJECTS) $(preload_static_LDADD) $(LIBS) ++ $(preload_static_LINK) $(preload_static_OBJECTS) $(preload_static_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -336,50 +333,50 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preload_static-preload.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + preload-preload.o: preload.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_CFLAGS) $(CFLAGS) -MT preload-preload.o -MD -MP -MF "$(DEPDIR)/preload-preload.Tpo" -c -o preload-preload.o `test -f 'preload.c' || echo '$(srcdir)/'`preload.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/preload-preload.Tpo" "$(DEPDIR)/preload-preload.Po"; else rm -f "$(DEPDIR)/preload-preload.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_CFLAGS) $(CFLAGS) -MT preload-preload.o -MD -MP -MF $(DEPDIR)/preload-preload.Tpo -c -o preload-preload.o `test -f 'preload.c' || echo '$(srcdir)/'`preload.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/preload-preload.Tpo $(DEPDIR)/preload-preload.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='preload.c' object='preload-preload.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_CFLAGS) $(CFLAGS) -c -o preload-preload.o `test -f 'preload.c' || echo '$(srcdir)/'`preload.c + + preload-preload.obj: preload.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_CFLAGS) $(CFLAGS) -MT preload-preload.obj -MD -MP -MF "$(DEPDIR)/preload-preload.Tpo" -c -o preload-preload.obj `if test -f 'preload.c'; then $(CYGPATH_W) 'preload.c'; else $(CYGPATH_W) '$(srcdir)/preload.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/preload-preload.Tpo" "$(DEPDIR)/preload-preload.Po"; else rm -f "$(DEPDIR)/preload-preload.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_CFLAGS) $(CFLAGS) -MT preload-preload.obj -MD -MP -MF $(DEPDIR)/preload-preload.Tpo -c -o preload-preload.obj `if test -f 'preload.c'; then $(CYGPATH_W) 'preload.c'; else $(CYGPATH_W) '$(srcdir)/preload.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/preload-preload.Tpo $(DEPDIR)/preload-preload.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='preload.c' object='preload-preload.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_CFLAGS) $(CFLAGS) -c -o preload-preload.obj `if test -f 'preload.c'; then $(CYGPATH_W) 'preload.c'; else $(CYGPATH_W) '$(srcdir)/preload.c'; fi` + + preload_static-preload.o: preload.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_static_CFLAGS) $(CFLAGS) -MT preload_static-preload.o -MD -MP -MF "$(DEPDIR)/preload_static-preload.Tpo" -c -o preload_static-preload.o `test -f 'preload.c' || echo '$(srcdir)/'`preload.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/preload_static-preload.Tpo" "$(DEPDIR)/preload_static-preload.Po"; else rm -f "$(DEPDIR)/preload_static-preload.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_static_CFLAGS) $(CFLAGS) -MT preload_static-preload.o -MD -MP -MF $(DEPDIR)/preload_static-preload.Tpo -c -o preload_static-preload.o `test -f 'preload.c' || echo '$(srcdir)/'`preload.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/preload_static-preload.Tpo $(DEPDIR)/preload_static-preload.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='preload.c' object='preload_static-preload.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_static_CFLAGS) $(CFLAGS) -c -o preload_static-preload.o `test -f 'preload.c' || echo '$(srcdir)/'`preload.c + + preload_static-preload.obj: preload.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_static_CFLAGS) $(CFLAGS) -MT preload_static-preload.obj -MD -MP -MF "$(DEPDIR)/preload_static-preload.Tpo" -c -o preload_static-preload.obj `if test -f 'preload.c'; then $(CYGPATH_W) 'preload.c'; else $(CYGPATH_W) '$(srcdir)/preload.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/preload_static-preload.Tpo" "$(DEPDIR)/preload_static-preload.Po"; else rm -f "$(DEPDIR)/preload_static-preload.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_static_CFLAGS) $(CFLAGS) -MT preload_static-preload.obj -MD -MP -MF $(DEPDIR)/preload_static-preload.Tpo -c -o preload_static-preload.obj `if test -f 'preload.c'; then $(CYGPATH_W) 'preload.c'; else $(CYGPATH_W) '$(srcdir)/preload.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/preload_static-preload.Tpo $(DEPDIR)/preload_static-preload.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='preload.c' object='preload_static-preload.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(preload_static_CFLAGS) $(CFLAGS) -c -o preload_static-preload.obj `if test -f 'preload.c'; then $(CYGPATH_W) 'preload.c'; else $(CYGPATH_W) '$(srcdir)/preload.c'; fi` +@@ -390,17 +387,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -412,8 +405,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -423,13 +416,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -443,22 +435,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -474,7 +465,7 @@ check: check-am + all-am: Makefile $(PROGRAMS) + installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -509,7 +500,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -523,12 +514,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -549,24 +548,27 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am ++uninstall-am: uninstall-binPROGRAMS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool clean-local 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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 \ +- uninstall-info-am ++ tags uninstall uninstall-am uninstall-binPROGRAMS + + +-../libelektra/libelektra.a: +- cd ../libelektra && $(MAKE) libelektra.a ++@ENABLE_STATIC_TRUE@../libelektra/libelektra.a: ++@ENABLE_STATIC_TRUE@ cd ../libelektra && $(MAKE) libelektra.a + + clean-local: + rm -f *.gcno *.gcda *.gcno +Index: elektra-0.7.0rc5/tests/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/tests/Makefile.in ++++ elektra-0.7.0rc5/tests/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,13 +13,10 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -35,6 +32,12 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++TESTS = test_key$(EXEEXT) test_ks$(EXEEXT) test_kdb$(EXEEXT) \ ++ test_xml$(EXEEXT) test_validate.sh test_getset$(EXEEXT) \ ++ test_trie$(EXEEXT) test_mount$(EXEEXT) test_cap$(EXEEXT) \ ++ test_stream$(EXEEXT) test_serialize$(EXEEXT) \ ++ test_split$(EXEEXT) test_internals$(EXEEXT) \ ++ test_backendhelpers$(EXEEXT) + check_PROGRAMS = test_key$(EXEEXT) test_ks$(EXEEXT) test_kdb$(EXEEXT) \ + test_xml$(EXEEXT) test_getset$(EXEEXT) test_trie$(EXEEXT) \ + test_mount$(EXEEXT) test_cap$(EXEEXT) test_stream$(EXEEXT) \ +@@ -43,8 +46,7 @@ check_PROGRAMS = test_key$(EXEEXT) test_ + subdir = tests + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -104,17 +106,18 @@ am_test_xml_OBJECTS = test_xml.$(OBJEXT) + test_xml_OBJECTS = $(am_test_xml_OBJECTS) + test_xml_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + ../src/libelektra/libelektra.a +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(test_backendhelpers_SOURCES) $(test_cap_SOURCES) \ + $(test_getset_SOURCES) $(test_internals_SOURCES) \ + $(test_kdb_SOURCES) $(test_key_SOURCES) $(test_ks_SOURCES) \ +@@ -130,10 +133,7 @@ DIST_SOURCES = $(test_backendhelpers_SOU + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -159,8 +159,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -171,20 +169,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -206,6 +195,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -221,25 +211,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -253,6 +239,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -263,7 +250,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -279,6 +265,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -292,6 +280,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -299,11 +288,12 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + AM_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) + AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL) +-TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers + #check_PROGRAMS = test_backendhelpers + @VALGRINDTESTS_TRUE@TESTS_ENVIRONMENT = $(VALGRIND) --quiet --show-reachable=yes --leak-check=yes + EXTRA_DIST = dbelow.c filesys.xml fstab.xml hosts.xml keyset.c keyset.xml key.xml others.c passwd.xml test_script.sh test_validate.sh tests.c tests.h +@@ -375,43 +365,43 @@ clean-checkPROGRAMS: + done + test_backendhelpers$(EXEEXT): $(test_backendhelpers_OBJECTS) $(test_backendhelpers_DEPENDENCIES) + @rm -f test_backendhelpers$(EXEEXT) +- $(LINK) $(test_backendhelpers_LDFLAGS) $(test_backendhelpers_OBJECTS) $(test_backendhelpers_LDADD) $(LIBS) ++ $(LINK) $(test_backendhelpers_OBJECTS) $(test_backendhelpers_LDADD) $(LIBS) + test_cap$(EXEEXT): $(test_cap_OBJECTS) $(test_cap_DEPENDENCIES) + @rm -f test_cap$(EXEEXT) +- $(LINK) $(test_cap_LDFLAGS) $(test_cap_OBJECTS) $(test_cap_LDADD) $(LIBS) ++ $(LINK) $(test_cap_OBJECTS) $(test_cap_LDADD) $(LIBS) + test_getset$(EXEEXT): $(test_getset_OBJECTS) $(test_getset_DEPENDENCIES) + @rm -f test_getset$(EXEEXT) +- $(LINK) $(test_getset_LDFLAGS) $(test_getset_OBJECTS) $(test_getset_LDADD) $(LIBS) ++ $(LINK) $(test_getset_OBJECTS) $(test_getset_LDADD) $(LIBS) + test_internals$(EXEEXT): $(test_internals_OBJECTS) $(test_internals_DEPENDENCIES) + @rm -f test_internals$(EXEEXT) +- $(LINK) $(test_internals_LDFLAGS) $(test_internals_OBJECTS) $(test_internals_LDADD) $(LIBS) ++ $(LINK) $(test_internals_OBJECTS) $(test_internals_LDADD) $(LIBS) + test_kdb$(EXEEXT): $(test_kdb_OBJECTS) $(test_kdb_DEPENDENCIES) + @rm -f test_kdb$(EXEEXT) +- $(LINK) $(test_kdb_LDFLAGS) $(test_kdb_OBJECTS) $(test_kdb_LDADD) $(LIBS) ++ $(LINK) $(test_kdb_OBJECTS) $(test_kdb_LDADD) $(LIBS) + test_key$(EXEEXT): $(test_key_OBJECTS) $(test_key_DEPENDENCIES) + @rm -f test_key$(EXEEXT) +- $(LINK) $(test_key_LDFLAGS) $(test_key_OBJECTS) $(test_key_LDADD) $(LIBS) ++ $(LINK) $(test_key_OBJECTS) $(test_key_LDADD) $(LIBS) + test_ks$(EXEEXT): $(test_ks_OBJECTS) $(test_ks_DEPENDENCIES) + @rm -f test_ks$(EXEEXT) +- $(LINK) $(test_ks_LDFLAGS) $(test_ks_OBJECTS) $(test_ks_LDADD) $(LIBS) ++ $(LINK) $(test_ks_OBJECTS) $(test_ks_LDADD) $(LIBS) + test_mount$(EXEEXT): $(test_mount_OBJECTS) $(test_mount_DEPENDENCIES) + @rm -f test_mount$(EXEEXT) +- $(LINK) $(test_mount_LDFLAGS) $(test_mount_OBJECTS) $(test_mount_LDADD) $(LIBS) ++ $(LINK) $(test_mount_OBJECTS) $(test_mount_LDADD) $(LIBS) + test_serialize$(EXEEXT): $(test_serialize_OBJECTS) $(test_serialize_DEPENDENCIES) + @rm -f test_serialize$(EXEEXT) +- $(LINK) $(test_serialize_LDFLAGS) $(test_serialize_OBJECTS) $(test_serialize_LDADD) $(LIBS) ++ $(LINK) $(test_serialize_OBJECTS) $(test_serialize_LDADD) $(LIBS) + test_split$(EXEEXT): $(test_split_OBJECTS) $(test_split_DEPENDENCIES) + @rm -f test_split$(EXEEXT) +- $(LINK) $(test_split_LDFLAGS) $(test_split_OBJECTS) $(test_split_LDADD) $(LIBS) ++ $(LINK) $(test_split_OBJECTS) $(test_split_LDADD) $(LIBS) + test_stream$(EXEEXT): $(test_stream_OBJECTS) $(test_stream_DEPENDENCIES) + @rm -f test_stream$(EXEEXT) +- $(LINK) $(test_stream_LDFLAGS) $(test_stream_OBJECTS) $(test_stream_LDADD) $(LIBS) ++ $(LINK) $(test_stream_OBJECTS) $(test_stream_LDADD) $(LIBS) + test_trie$(EXEEXT): $(test_trie_OBJECTS) $(test_trie_DEPENDENCIES) + @rm -f test_trie$(EXEEXT) +- $(LINK) $(test_trie_LDFLAGS) $(test_trie_OBJECTS) $(test_trie_LDADD) $(LIBS) ++ $(LINK) $(test_trie_OBJECTS) $(test_trie_LDADD) $(LIBS) + test_xml$(EXEEXT): $(test_xml_OBJECTS) $(test_xml_DEPENDENCIES) + @rm -f test_xml$(EXEEXT) +- $(LINK) $(test_xml_LDFLAGS) $(test_xml_OBJECTS) $(test_xml_LDADD) $(LIBS) ++ $(LINK) $(test_xml_OBJECTS) $(test_xml_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -435,22 +425,22 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -461,17 +451,13 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -483,8 +469,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -494,13 +480,12 @@ ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -514,9 +499,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -525,7 +510,7 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ ++ *$$ws$$tst$$ws*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -537,7 +522,7 @@ check-TESTS: $(TESTS) + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ ++ *$$ws$$tst$$ws*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -587,22 +572,21 @@ check-TESTS: $(TESTS) + else :; fi + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -652,7 +636,7 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -666,12 +650,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -692,19 +684,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool clean-local \ + 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ 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-info-am ++ tags uninstall uninstall-am + + + clean-local: +Index: elektra-0.7.0rc5/xmlschema/Makefile.in +=================================================================== +--- elektra-0.7.0rc5.orig/xmlschema/Makefile.in ++++ elektra-0.7.0rc5/xmlschema/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,13 +14,10 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -39,8 +36,7 @@ target_triplet = @target@ + subdir = xmlschema + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -58,10 +54,7 @@ am__installdirs = "$(DESTDIR)$(elektraxs + elektraxsdDATA_INSTALL = $(INSTALL_DATA) + DATA = $(elektraxsd_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-INSTALL = @INSTALL@ + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -87,8 +80,6 @@ CXXFLAGS = @CXXFLAGS@ + CXXOPTFLAGS = @CXXOPTFLAGS@ + CXXSTDFLAGS = @CXXSTDFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-DEBUG_FALSE = @DEBUG_FALSE@ +-DEBUG_TRUE = @DEBUG_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ +@@ -99,20 +90,11 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ +-EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GENHTML = @GENHTML@ + GREP = @GREP@ +-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ +-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ +-HAVE_MAN2HTML_FALSE = @HAVE_MAN2HTML_FALSE@ +-HAVE_MAN2HTML_TRUE = @HAVE_MAN2HTML_TRUE@ +-HAVE_XML_FALSE = @HAVE_XML_FALSE@ +-HAVE_XML_TRUE = @HAVE_XML_TRUE@ +-HAVE_XSL_FALSE = @HAVE_XSL_FALSE@ +-HAVE_XSL_TRUE = @HAVE_XSL_TRUE@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -134,6 +116,7 @@ LTDLINCL = @LTDLINCL@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ +@@ -149,25 +132,21 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VALGRIND = @VALGRIND@ +-VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ +-VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ + VERSION_API = @VERSION_API@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -181,6 +160,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dbroot = @dbroot@ +@@ -191,7 +171,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -207,6 +186,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + man2html = @man2html@ +@@ -220,6 +201,7 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target = @target@ +@@ -227,6 +209,8 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ + elektraxsddir = $(datadir)/sgml/elektra-$(PACKAGE_VERSION) +@@ -270,13 +254,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-elektraxsdDATA: $(elektraxsd_DATA) + @$(NORMAL_INSTALL) +- test -z "$(elektraxsddir)" || $(mkdir_p) "$(DESTDIR)$(elektraxsddir)" ++ test -z "$(elektraxsddir)" || $(MKDIR_P) "$(DESTDIR)$(elektraxsddir)" + @list='$(elektraxsd_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -299,22 +279,21 @@ CTAGS: + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -330,7 +309,7 @@ check: check-am + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(elektraxsddir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -362,7 +341,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -376,12 +355,20 @@ info-am: + + install-data-am: install-elektraxsdDATA + ++install-dvi: install-dvi-am ++ + 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 ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -400,18 +387,21 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-elektraxsdDATA uninstall-info-am ++uninstall-am: uninstall-elektraxsdDATA ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-elektraxsdDATA \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-elektraxsdDATA 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-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-elektraxsdDATA \ +- uninstall-info-am ++ ps ps-am uninstall uninstall-am uninstall-elektraxsdDATA + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-file-existence.diff b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-file-existence.diff new file mode 100644 index 000000000..8a21e7797 --- /dev/null +++ b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-file-existence.diff @@ -0,0 +1,17 @@ +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: elektra-0.7.0rc5/configure.ac +=================================================================== +--- elektra-0.7.0rc5.orig/configure.ac ++++ elektra-0.7.0rc5/configure.ac +@@ -287,7 +287,7 @@ AC_PROG_LIBTOOL + # xsltproc + AC_PATH_PROG(xsltproc, xsltproc, "no") + # Check if have style-sheet too +-if test "x$default_docbook" != "xno"; then ++if test "x$default_docbook" != "xno" && test "x$cross_compiling" = "xno"; then + AC_CHECK_FILE([$default_docbook/manpages/docbook.xsl], + [dbroot=$default_docbook], + [dbroot="no"]) diff --git a/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-libxml2.diff b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-libxml2.diff new file mode 100644 index 000000000..183610b68 --- /dev/null +++ b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-libxml2.diff @@ -0,0 +1,36 @@ +--- + configure.ac | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +Index: elektra-0.7.0rc5/configure.ac +=================================================================== +--- elektra-0.7.0rc5.orig/configure.ac ++++ elektra-0.7.0rc5/configure.ac +@@ -368,14 +368,22 @@ fi + privatelibs="" + + # Check for libxml (Allow compilation of libelektratools) +-AM_PATH_XML2(, [elektra_have_xml="yes"], [elektra_have_xml="no"]) +-AM_CONDITIONAL(HAVE_XML, [test x$elektra_have_xml = xyes]) +-if test "x$elektra_have_xml" = "xyes"; then ++REQUIRES_LIBXML2="libxml2 >= 2.6.0" ++AC_SUBST(REQUIRES_LIBXML2) ++PKG_CHECK_MODULES([libxml2], ++ [${REQUIRES_LIBXML2}], ++ [HAVE_XML=yes], ++ [HAVE_XML=no] ++) ++AC_SUBST(libxml2_CFLAGS) ++AC_SUBST(libxml2_LIBS) ++AM_CONDITIONAL([HAVE_XML],[test "$HAVE_XML" = "yes"]) ++ ++if test $HAVE_XML; then + elektratools=libelektratools +- privatelibs=$privatelibs" -lxml2" ++ privatelibs=$privatelibs"$libxml2_LIBS" + fi + +-AC_SUBST(elektratools) + + + diff --git a/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-static-libs.diff b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-static-libs.diff new file mode 100644 index 000000000..cb8a2d6e4 --- /dev/null +++ b/patches/elektra-0.7.0rc5/generic/elektra-0.7.0rc5-static-libs.diff @@ -0,0 +1,98 @@ +--- + configure.ac | 12 +++++++----- + src/kdb/Makefile.am | 10 +++++++++- + src/preload/Makefile.am | 10 +++++++++- + 3 files changed, 25 insertions(+), 7 deletions(-) + +Index: elektra-0.7.0rc5/configure.ac +=================================================================== +--- elektra-0.7.0rc5.orig/configure.ac ++++ elektra-0.7.0rc5/configure.ac +@@ -56,7 +56,7 @@ esac + # Disable libtool static lib + #AC_DISABLE_STATIC + +- ++AM_CONDITIONAL([ENABLE_STATIC],[test x$enable_static = xyes]) + + + +@@ -493,10 +493,12 @@ ALLOW_BACKEND(daemon, [test x$elektra_uc + + AC_SUBST(BACKENDS) + +-backend_static_libs= +-for backend in $BACKENDS; do +- backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a" +-done ++if test x$enable_static = xyes; then ++ backend_static_libs= ++ for backend in $BACKENDS; do ++ backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a" ++ done ++fi + + AC_SUBST(privatelibs) + AC_SUBST(backend_static_libs) +Index: elektra-0.7.0rc5/src/kdb/Makefile.am +=================================================================== +--- elektra-0.7.0rc5.orig/src/kdb/Makefile.am ++++ elektra-0.7.0rc5/src/kdb/Makefile.am +@@ -5,17 +5,25 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/includ + + kdb_source = kdb-tool.c kdb-tool.h help.c BSDgetopt.c BSDgetopt.h ../include/kdb.h ../include/kdbloader.h ../include/kdbtools.h + +-bin_PROGRAMS = kdb kdb_static ++if ENABLE_STATIC ++KDB_STATIC=kdb_static ++else ++KDB_STATIC= ++endif ++ ++bin_PROGRAMS = kdb $(KDB_STATIC) + kdb_SOURCES = $(kdb_source) + kdb_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV) + kdb_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) + ++if ENABLE_STATIC + kdb_static_SOURCES = $(kdb_source) + kdb_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV) + kdb_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS) + + ../libelektra/libelektra.a: + cd ../libelektra && $(MAKE) libelektra.a ++endif + + clean-local: + rm -f *.gcno *.gcda *.gcno +Index: elektra-0.7.0rc5/src/preload/Makefile.am +=================================================================== +--- elektra-0.7.0rc5.orig/src/preload/Makefile.am ++++ elektra-0.7.0rc5/src/preload/Makefile.am +@@ -3,17 +3,25 @@ AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" + + preload_source = preload.c ../include/kdb.h + +-bin_PROGRAMS = preload preload_static ++if ENABLE_STATIC ++PRELOAD_STATIC=preload_static ++else ++PRELOAD_STATIC= ++endif ++ ++bin_PROGRAMS = preload $(PRELOAD_STATIC) + preload_SOURCES = $(preload_source) + preload_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV) + preload_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) + ++if ENABLE_STATIC + preload_static_SOURCES = $(preload_source) + preload_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV) + preload_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS) + + ../libelektra/libelektra.a: + cd ../libelektra && $(MAKE) libelektra.a ++endif + + clean-local: + rm -f *.gcno *.gcda *.gcno diff --git a/patches/elektra-0.7.0rc5/generic/series b/patches/elektra-0.7.0rc5/generic/series new file mode 100644 index 000000000..3a409b172 --- /dev/null +++ b/patches/elektra-0.7.0rc5/generic/series @@ -0,0 +1,4 @@ +elektra-0.7.0rc5-file-existence.diff +elektra-0.7.0rc5-libxml2.diff +elektra-0.7.0rc5-static-libs.diff +elektra-0.7.0rc5-autogen.diff |