diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-10-29 12:09:24 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-10-29 12:09:24 +0000 |
| commit | 4aaf101f9c0b65b8068cda58b528071bcd78d585 (patch) | |
| tree | 8c92579eafc8f0e4de7e6177fe7878a80755af9a /patches/elektra-0.7.0-r1618 | |
| parent | 3ef96fdd90147f839af4d0c570031d16c53bdc8d (diff) | |
| download | ptxdist-4aaf101f9c0b65b8068cda58b528071bcd78d585.tar.gz ptxdist-4aaf101f9c0b65b8068cda58b528071bcd78d585.tar.xz | |
* elektra: more steps to finally make it work
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8988 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/elektra-0.7.0-r1618')
6 files changed, 2776 insertions, 0 deletions
diff --git a/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0-r1618-ini-debug.diff b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0-r1618-ini-debug.diff new file mode 100644 index 000000000..954a21daf --- /dev/null +++ b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0-r1618-ini-debug.diff @@ -0,0 +1,29 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: ini backend: fix DEBUG handling + +When compiled without "--enable-debug", the ini backend nevertheless +defines DEBUG and thus we get output. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + src/backends/ini/Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +Index: elektra-0.7.0-r1618/src/backends/ini/Makefile.am +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/ini/Makefile.am ++++ elektra-0.7.0-r1618/src/backends/ini/Makefile.am +@@ -1,7 +1,11 @@ + # $Id: Makefile.am 1618 2008-10-17 16:03:11Z registry@markus-raab.org $ + ++if DEBUG ++INI_DEBUG=-DDEBUG ++endif ++ + #testdir = $(develdocdir)/src/backends/ini/ +-AM_CPPFLAGS = -I$(top_srcdir)/src/include -DDEBUG -D_POSIX_SOURCE -D_BSD_SOURCE ++AM_CPPFLAGS = -I$(top_srcdir)/src/include $(INI_DEBUG) -D_POSIX_SOURCE -D_BSD_SOURCE + + ini_sources = ini.c helpers.c parser.c ini.h ../../include/kdb.h ../../include/kdbbackend.h + noinst_LIBRARIES = libelektra-ini.a diff --git a/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-autogen.diff b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-autogen.diff new file mode 100644 index 000000000..c4ab8b1e8 --- /dev/null +++ b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-autogen.diff @@ -0,0 +1,2591 @@ +--- + Makefile.in | 9 + aclocal.m4 | 189 --------------- + benchmarks/Makefile.in | 9 + configure | 445 +++++++++--------------------------- + doc/Makefile.in | 9 + doc/images/Makefile.in | 9 + doc/standards/Makefile.in | 9 + examples/Makefile.in | 9 + scripts/Makefile.in | 9 + src/Makefile.in | 9 + src/backends/Makefile.in | 9 + src/backends/berkeleydb/Makefile.in | 9 + src/backends/daemon/Makefile.in | 9 + src/backends/filesys/Makefile.in | 9 + src/backends/fstab/Makefile.in | 9 + src/backends/gconf/Makefile.in | 9 + src/backends/hosts/Makefile.in | 9 + src/backends/ini/Makefile.in | 12 + src/backends/passwd/Makefile.in | 9 + src/backends/template/Makefile.in | 9 + src/bindings/Makefile.in | 9 + src/bindings/cpp/Makefile.in | 9 + src/bindings/cpp/tests/Makefile.in | 9 + src/bindings/python/Makefile.in | 9 + src/include/Makefile.in | 9 + src/kdb/Makefile.in | 36 +- + src/libelektra/Makefile.in | 9 + src/libelektratools/Makefile.in | 13 - + src/libhelper/Makefile.in | 9 + src/libloader/Makefile.in | 9 + src/preload/Makefile.in | 35 +- + tests/Makefile.in | 9 + xmlschema/Makefile.in | 9 + 33 files changed, 307 insertions(+), 666 deletions(-) + +Index: elektra-0.7.0-r1618/aclocal.m4 +=================================================================== +--- elektra-0.7.0-r1618.orig/aclocal.m4 ++++ elektra-0.7.0-r1618/aclocal.m4 +@@ -7851,195 +7851,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>. +Index: elektra-0.7.0-r1618/benchmarks/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/benchmarks/Makefile.in ++++ elektra-0.7.0-r1618/benchmarks/Makefile.in +@@ -92,6 +92,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -151,6 +153,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -159,9 +162,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -192,7 +192,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -208,6 +207,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/configure +=================================================================== +--- elektra-0.7.0-r1618.orig/configure ++++ elektra-0.7.0-r1618/configure +@@ -866,6 +866,8 @@ am__fastdepCC_FALSE + CPP + GREP + EGREP ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE + DEBUG_TRUE + DEBUG_FALSE + EXPERIMENTAL_TRUE +@@ -933,12 +935,11 @@ HAVE_LIBLTDL_TRUE + HAVE_LIBLTDL_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 +@@ -963,6 +964,8 @@ CXXFLAGS + CCC + PKG_CONFIG + CXXCPP ++libxml2_CFLAGS ++libxml2_LIBS + gconf_CFLAGS + gconf_LIBS' + ac_subdirs_all='libltdl' +@@ -1560,7 +1563,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] +@@ -1607,8 +1609,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 +@@ -1623,6 +1623,10 @@ Some influential environment variables: + CXXFLAGS C++ compiler flags + PKG_CONFIG path to pkg-config utility + CXXCPP C++ preprocessor ++ 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 +@@ -4730,6 +4734,15 @@ esac + + + ++if test x$enable_static = xyes; then ++ ENABLE_STATIC_TRUE= ++ ENABLE_STATIC_FALSE='#' ++else ++ ENABLE_STATIC_TRUE='#' ++ ENABLE_STATIC_FALSE= ++fi ++ ++ + + + +@@ -6875,7 +6888,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; } +@@ -8985,13 +8998,13 @@ if test "${lt_cv_nm_interface+set}" = se + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:8988: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:9001: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:8991: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:9004: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:8994: output\"" >&5) ++ (eval echo "\"\$as_me:9007: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -10201,7 +10214,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 10204 "configure"' > conftest.$ac_ext ++ echo '#line 10217 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -12282,11 +12295,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:12285: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12298: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12289: \$? = $ac_status" >&5 ++ echo "$as_me:12302: \$? = $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. +@@ -12621,11 +12634,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:12624: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12637: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12628: \$? = $ac_status" >&5 ++ echo "$as_me:12641: \$? = $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. +@@ -12726,11 +12739,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:12729: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12742: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12733: \$? = $ac_status" >&5 ++ echo "$as_me:12746: \$? = $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 +@@ -12781,11 +12794,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:12784: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12797: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12788: \$? = $ac_status" >&5 ++ echo "$as_me:12801: \$? = $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 +@@ -15537,7 +15550,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 15540 "configure" ++#line 15553 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15633,7 +15646,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 15636 "configure" ++#line 15649 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -17645,11 +17658,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:17648: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17661: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17652: \$? = $ac_status" >&5 ++ echo "$as_me:17665: \$? = $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. +@@ -17744,11 +17757,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:17747: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17760: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17751: \$? = $ac_status" >&5 ++ echo "$as_me:17764: \$? = $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 +@@ -17796,11 +17809,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:17799: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17812: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17803: \$? = $ac_status" >&5 ++ echo "$as_me:17816: \$? = $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 +@@ -19965,322 +19978,86 @@ fi + privatelibs="" + + # Check for libxml (Allow compilation of libelektratools) ++REQUIRES_LIBXML2="libxml2 >= 2.6.0" + + +-# 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 +- ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for libxml2" >&5 ++echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; } + +-# 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" ++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 +- xml_config_exec_prefix="" ++ pkg_failed=yes + fi +- +-# Check whether --enable-xmltest was given. +-if test "${enable_xmltest+set}" = set; then +- enableval=$enable_xmltest; ++ fi + else +- enable_xmltest=yes ++ pkg_failed=untried + 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 ++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 +- 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 ++ pkg_failed=yes + 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; } ++ fi + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ pkg_failed=untried + 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; +-} ++if test $pkg_failed = yes; then + +-_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 +- : ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=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 +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ _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 + +- +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- +- 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" +- else +- { echo "$as_me:$LINENO: result: no" >&5 ++ { 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 +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ HAVE_XML=no + +-#include <libxml/xmlversion.h> +-#include <stdio.h> ++elif test $pkg_failed = untried; then ++ HAVE_XML=no + +-int +-main () +-{ +- LIBXML_TEST_VERSION; return 0; +- ; +- 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 +- 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" + 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" ++ 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 + +-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 +- +- XML_CPPFLAGS="" +- XML_LIBS="" +- elektra_have_xml="no" +- fi +- +- +- rm -f conf.xmltest + + + +-if test x$elektra_have_xml = xyes; then ++if test "$HAVE_XML" = "yes"; then + HAVE_XML_TRUE= + HAVE_XML_FALSE='#' + else +@@ -20288,9 +20065,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 + + +@@ -20301,7 +20079,6 @@ fi + + + +- + # + # Backends enable and disable logic. + # +@@ -21289,10 +21066,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 + + + +@@ -23837,6 +23616,13 @@ echo "$as_me: error: conditional \"am__f + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++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 \"ENABLE_STATIC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -24972,6 +24758,8 @@ for ac_last_try in false false false fal + cat >conf$$subs.sed <<_ACEOF + 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 +@@ -25039,12 +24827,11 @@ HAVE_LIBLTDL_TRUE!$HAVE_LIBLTDL_TRUE$ac_ + HAVE_LIBLTDL_FALSE!$HAVE_LIBLTDL_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 +@@ -25056,7 +24843,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` = 84; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +Index: elektra-0.7.0-r1618/doc/images/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/doc/images/Makefile.in ++++ elektra-0.7.0-r1618/doc/images/Makefile.in +@@ -94,6 +94,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -153,6 +155,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -161,9 +164,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -194,7 +194,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -210,6 +209,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/doc/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/doc/Makefile.in ++++ elektra-0.7.0-r1618/doc/Makefile.in +@@ -121,6 +121,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -180,6 +182,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -188,9 +191,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -221,7 +221,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 +236,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/doc/standards/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/doc/standards/Makefile.in ++++ elektra-0.7.0-r1618/doc/standards/Makefile.in +@@ -94,6 +94,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -153,6 +155,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -161,9 +164,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -194,7 +194,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -210,6 +209,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/examples/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/examples/Makefile.in ++++ elektra-0.7.0-r1618/examples/Makefile.in +@@ -162,6 +162,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -221,6 +223,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -229,9 +232,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -262,7 +262,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -278,6 +277,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/Makefile.in ++++ elektra-0.7.0-r1618/Makefile.in +@@ -129,6 +129,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -188,6 +190,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -196,9 +199,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -229,7 +229,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -245,6 +244,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/scripts/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/scripts/Makefile.in ++++ elektra-0.7.0-r1618/scripts/Makefile.in +@@ -111,6 +111,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -170,6 +172,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -178,9 +181,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -211,7 +211,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -227,6 +226,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/berkeleydb/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/berkeleydb/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/berkeleydb/Makefile.in +@@ -132,6 +132,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -191,6 +193,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -199,9 +202,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -232,7 +232,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -248,6 +247,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/daemon/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/daemon/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/daemon/Makefile.in +@@ -157,6 +157,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -216,6 +218,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -224,9 +227,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -257,7 +257,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -273,6 +272,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/filesys/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/filesys/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/filesys/Makefile.in +@@ -128,6 +128,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -187,6 +189,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -195,9 +198,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -228,7 +228,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -244,6 +243,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/fstab/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/fstab/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/fstab/Makefile.in +@@ -128,6 +128,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -187,6 +189,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -195,9 +198,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -228,7 +228,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -244,6 +243,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/gconf/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/gconf/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/gconf/Makefile.in +@@ -134,6 +134,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -193,6 +195,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -201,9 +204,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -234,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@ +@@ -250,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/hosts/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/hosts/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/hosts/Makefile.in +@@ -130,6 +130,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -189,6 +191,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -197,9 +200,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -230,7 +230,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 +245,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/ini/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/ini/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/ini/Makefile.in +@@ -133,6 +133,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -192,6 +194,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -200,9 +203,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -233,7 +233,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 +248,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +@@ -272,9 +273,10 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + ulibdir = @ulibdir@ + xsltproc = @xsltproc@ ++@DEBUG_TRUE@INI_DEBUG = -DDEBUG + + #testdir = $(develdocdir)/src/backends/ini/ +-AM_CPPFLAGS = -I$(top_srcdir)/src/include -DDEBUG -D_POSIX_SOURCE -D_BSD_SOURCE ++AM_CPPFLAGS = -I$(top_srcdir)/src/include $(INI_DEBUG) -D_POSIX_SOURCE -D_BSD_SOURCE + ini_sources = ini.c helpers.c parser.c ini.h ../../include/kdb.h ../../include/kdbbackend.h + noinst_LIBRARIES = libelektra-ini.a + libelektra_ini_a_SOURCES = $(ini_sources) +Index: elektra-0.7.0-r1618/src/backends/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/Makefile.in +@@ -100,6 +100,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -159,6 +161,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -167,9 +170,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -200,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@ +@@ -216,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/passwd/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/passwd/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/passwd/Makefile.in +@@ -131,6 +131,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -190,6 +192,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -198,9 +201,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -231,7 +231,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -247,6 +246,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/backends/template/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/backends/template/Makefile.in ++++ elektra-0.7.0-r1618/src/backends/template/Makefile.in +@@ -133,6 +133,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -192,6 +194,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -200,9 +203,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -233,7 +233,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 +248,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/bindings/cpp/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/bindings/cpp/Makefile.in ++++ elektra-0.7.0-r1618/src/bindings/cpp/Makefile.in +@@ -141,6 +141,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -200,6 +202,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -208,9 +211,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -241,7 +241,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -257,6 +256,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/bindings/cpp/tests/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/bindings/cpp/tests/Makefile.in ++++ elektra-0.7.0-r1618/src/bindings/cpp/tests/Makefile.in +@@ -128,6 +128,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -187,6 +189,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -195,9 +198,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -228,7 +228,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -244,6 +243,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/bindings/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/bindings/Makefile.in ++++ elektra-0.7.0-r1618/src/bindings/Makefile.in +@@ -102,6 +102,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -161,6 +163,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -169,9 +172,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -202,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@ +@@ -218,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/bindings/python/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/bindings/python/Makefile.in ++++ elektra-0.7.0-r1618/src/bindings/python/Makefile.in +@@ -118,6 +118,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -177,6 +179,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -185,9 +188,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -218,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@ +@@ -234,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/include/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/include/Makefile.in ++++ elektra-0.7.0-r1618/src/include/Makefile.in +@@ -107,6 +107,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -166,6 +168,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -174,9 +177,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -207,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@ +@@ -223,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/kdb/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/kdb/Makefile.in ++++ elektra-0.7.0-r1618/src/kdb/Makefile.in +@@ -38,7 +38,7 @@ 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 +@@ -52,6 +52,7 @@ am__configure_deps = $(am__aclocal_m4_de + 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) +@@ -62,12 +63,16 @@ kdb_OBJECTS = $(am_kdb_OBJECTS) + am__DEPENDENCIES_1 = + kdb_DEPENDENCIES = ../libelektra/libelektra.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ++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) ++@ENABLE_STATIC_TRUE@kdb_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++@ENABLE_STATIC_TRUE@ ../libelektra/libelektra.a \ ++@ENABLE_STATIC_TRUE@ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -80,7 +85,7 @@ CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --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) +@@ -125,6 +130,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -184,6 +191,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -192,9 +200,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -225,7 +230,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -241,6 +245,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +@@ -266,12 +272,14 @@ 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: +@@ -639,8 +647,8 @@ uninstall-am: uninstall-binPROGRAMS unin + uninstall-info-am + + +-../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.0-r1618/src/libelektra/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/libelektra/Makefile.in ++++ elektra-0.7.0-r1618/src/libelektra/Makefile.in +@@ -144,6 +144,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -203,6 +205,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -211,9 +214,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -244,7 +244,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 +259,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/libelektratools/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/libelektratools/Makefile.in ++++ elektra-0.7.0-r1618/src/libelektratools/Makefile.in +@@ -76,10 +76,8 @@ am__libelektratools_a_SOURCES_DIST = kdb + libelektratools_a_OBJECTS = $(am_libelektratools_a_OBJECTS) + hlvlbackendLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(hlvlbackend_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 \ +@@ -145,6 +143,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -204,6 +204,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -212,9 +213,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -245,7 +243,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -261,6 +258,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/libhelper/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/libhelper/Makefile.in ++++ elektra-0.7.0-r1618/src/libhelper/Makefile.in +@@ -123,6 +123,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -182,6 +184,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -190,9 +193,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -223,7 +223,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 +238,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/libloader/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/libloader/Makefile.in ++++ elektra-0.7.0-r1618/src/libloader/Makefile.in +@@ -125,6 +125,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -184,6 +186,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -192,9 +195,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -225,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@ +@@ -241,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/Makefile.in ++++ elektra-0.7.0-r1618/src/Makefile.in +@@ -100,6 +100,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -159,6 +161,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -167,9 +170,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -200,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@ +@@ -216,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@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/src/preload/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/src/preload/Makefile.in ++++ elektra-0.7.0-r1618/src/preload/Makefile.in +@@ -36,7 +36,7 @@ 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 +@@ -50,6 +50,7 @@ am__configure_deps = $(am__aclocal_m4_de + 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) +@@ -59,11 +60,14 @@ preload_OBJECTS = $(am_preload_OBJECTS) + am__DEPENDENCIES_1 = + preload_DEPENDENCIES = ../libelektra/libelektra.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++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) ++@ENABLE_STATIC_TRUE@preload_static_DEPENDENCIES = \ ++@ENABLE_STATIC_TRUE@ $(am__DEPENDENCIES_1) \ ++@ENABLE_STATIC_TRUE@ ../libelektra/libelektra.a \ ++@ENABLE_STATIC_TRUE@ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -76,7 +80,7 @@ CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --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) +@@ -121,6 +125,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -180,6 +186,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -188,9 +195,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -221,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@ +@@ -237,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@ + lt_ECHO = @lt_ECHO@ +@@ -264,12 +269,14 @@ 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: +@@ -577,8 +584,8 @@ uninstall-am: uninstall-binPROGRAMS unin + uninstall-info-am + + +-../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.0-r1618/tests/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/tests/Makefile.in ++++ elektra-0.7.0-r1618/tests/Makefile.in +@@ -185,6 +185,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -244,6 +246,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -252,9 +255,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -285,7 +285,6 @@ develdocdir = @develdocdir@ + docdir = @docdir@ + doxygen = @doxygen@ + dvidir = @dvidir@ +-elektratools = @elektratools@ + exec_prefix = @exec_prefix@ + gconf_CFLAGS = @gconf_CFLAGS@ + gconf_LIBS = @gconf_LIBS@ +@@ -301,6 +300,8 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++libxml2_CFLAGS = @libxml2_CFLAGS@ ++libxml2_LIBS = @libxml2_LIBS@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +Index: elektra-0.7.0-r1618/xmlschema/Makefile.in +=================================================================== +--- elektra-0.7.0-r1618.orig/xmlschema/Makefile.in ++++ elektra-0.7.0-r1618/xmlschema/Makefile.in +@@ -102,6 +102,8 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ELEKTRATOOLS_VERSION_API = @ELEKTRATOOLS_VERSION_API@ + ELEKTRA_VERSION_API = @ELEKTRA_VERSION_API@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + EXPERIMENTAL_FALSE = @EXPERIMENTAL_FALSE@ + EXPERIMENTAL_TRUE = @EXPERIMENTAL_TRUE@ +@@ -161,6 +163,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + PYTHON = @PYTHON@ + RANLIB = @RANLIB@ ++REQUIRES_LIBXML2 = @REQUIRES_LIBXML2@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -169,9 +172,6 @@ VALGRIND = @VALGRIND@ + VALGRINDTESTS_FALSE = @VALGRINDTESTS_FALSE@ + VALGRINDTESTS_TRUE = @VALGRINDTESTS_TRUE@ + VERSION = @VERSION@ +-XML2_CONFIG = @XML2_CONFIG@ +-XML_CPPFLAGS = @XML_CPPFLAGS@ +-XML_LIBS = @XML_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -202,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@ +@@ -218,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@ + lt_ECHO = @lt_ECHO@ diff --git a/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-file-existence.diff b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-file-existence.diff new file mode 100644 index 000000000..85b588cd4 --- /dev/null +++ b/patches/elektra-0.7.0-r1618/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.0-r1618/configure.ac +=================================================================== +--- elektra-0.7.0-r1618.orig/configure.ac ++++ elektra-0.7.0-r1618/configure.ac +@@ -301,7 +301,7 @@ PKG_PROG_PKG_CONFIG + # 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.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff new file mode 100644 index 000000000..746b2584f --- /dev/null +++ b/patches/elektra-0.7.0-r1618/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.0-r1618/configure.ac +=================================================================== +--- elektra-0.7.0-r1618.orig/configure.ac ++++ elektra-0.7.0-r1618/configure.ac +@@ -435,14 +435,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.0-r1618/generic/elektra-0.7.0rc5-static-libs.diff b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-static-libs.diff new file mode 100644 index 000000000..fb1afffb3 --- /dev/null +++ b/patches/elektra-0.7.0-r1618/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.0-r1618/configure.ac +=================================================================== +--- elektra-0.7.0-r1618.orig/configure.ac ++++ elektra-0.7.0-r1618/configure.ac +@@ -59,7 +59,7 @@ esac + # Disable libtool static lib + #AC_DISABLE_STATIC + +- ++AM_CONDITIONAL([ENABLE_STATIC],[test x$enable_static = xyes]) + + + +@@ -560,10 +560,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.0-r1618/src/kdb/Makefile.am +=================================================================== +--- elektra-0.7.0-r1618.orig/src/kdb/Makefile.am ++++ elektra-0.7.0-r1618/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.0-r1618/src/preload/Makefile.am +=================================================================== +--- elektra-0.7.0-r1618.orig/src/preload/Makefile.am ++++ elektra-0.7.0-r1618/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.0-r1618/generic/series b/patches/elektra-0.7.0-r1618/generic/series new file mode 100644 index 000000000..7ca076283 --- /dev/null +++ b/patches/elektra-0.7.0-r1618/generic/series @@ -0,0 +1,5 @@ +elektra-0.7.0rc5-file-existence.diff +elektra-0.7.0rc5-libxml2.diff +elektra-0.7.0rc5-static-libs.diff +elektra-0.7.0-r1618-ini-debug.diff +elektra-0.7.0rc5-autogen.diff |