summaryrefslogtreecommitdiffstats
path: root/patches/owfs-2.7p7/owfs-2.7p7-autogen.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/owfs-2.7p7/owfs-2.7p7-autogen.diff')
-rw-r--r--patches/owfs-2.7p7/owfs-2.7p7-autogen.diff5485
1 files changed, 5485 insertions, 0 deletions
diff --git a/patches/owfs-2.7p7/owfs-2.7p7-autogen.diff b/patches/owfs-2.7p7/owfs-2.7p7-autogen.diff
new file mode 100644
index 000000000..b8494edec
--- /dev/null
+++ b/patches/owfs-2.7p7/owfs-2.7p7-autogen.diff
@@ -0,0 +1,5485 @@
+diff -ur owfs-2.7p7-orig/aclocal.m4 owfs-2.7p7/aclocal.m4
+--- owfs-2.7p7-orig/aclocal.m4 2008-09-28 16:19:59.000000000 +0200
++++ owfs-2.7p7/aclocal.m4 2008-11-01 12:29:06.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# serial 51 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -109,7 +109,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -211,6 +210,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -290,9 +291,80 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ ])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
+
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+@@ -573,7 +645,6 @@
+ esac
+ ;;
+ *64-bit*)
+- libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -618,7 +689,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -711,7 +786,7 @@
+ $2=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -982,7 +1057,7 @@
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -990,7 +1065,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -1307,7 +1382,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1632,13 +1707,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -1650,6 +1723,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -1830,6 +1915,13 @@
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -2329,7 +2421,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -2424,7 +2516,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -2765,7 +2857,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -2822,6 +2914,7 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -2931,7 +3024,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -2944,7 +3037,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -3090,51 +3183,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -3385,7 +3450,7 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -3458,7 +3523,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -3820,7 +3885,8 @@
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -3945,6 +4011,11 @@
+
+ $rm -f confest.$objext
+
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+@@ -4001,7 +4072,6 @@
+ ;;
+ esac
+ ])
+-
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -4086,7 +4156,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -4263,6 +4333,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -4325,7 +4396,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -4562,6 +4633,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -4911,7 +4986,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -4968,7 +5043,8 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -5005,7 +5081,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -5101,7 +5177,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+@@ -5139,7 +5215,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -5252,7 +5328,8 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+@@ -5322,7 +5399,8 @@
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -5459,7 +5537,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -5483,7 +5561,7 @@
+ #
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+@@ -5499,7 +5577,7 @@
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -5514,10 +5592,14 @@
+ cygwin* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -5548,12 +5630,14 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+@@ -5603,7 +5687,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5719,12 +5803,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -5822,7 +5907,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -5842,7 +5927,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -6002,11 +6087,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -6156,7 +6240,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -6587,6 +6671,164 @@
+ AC_MSG_RESULT([$SED])
+ ])
+
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
++
+ # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+Only in owfs-2.7p7: autom4te.cache
+diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
+--- owfs-2.7p7-orig/configure 2008-09-29 16:25:09.000000000 +0200
++++ owfs-2.7p7/configure 2008-11-01 12:29:10.000000000 +0100
+@@ -879,6 +879,8 @@
+ GREP
+ EGREP
+ AR
++DSYMUTIL
++NMEDIT
+ DLLTOOL
+ AS
+ OBJDUMP
+@@ -1040,8 +1042,10 @@
+ ENABLE_PROFILING_FALSE
+ LD_EXTRALIBS
+ OSLIBS
+-fuse_include_path
+-fuse_lib_path
++REQUIRES_FUSE
++PKG_CONFIG
++fuse_CFLAGS
++fuse_LIBS
+ FUSE_LIBS
+ FUSE_FLAGS
+ FUSE_INCLUDES
+@@ -1093,7 +1097,10 @@
+ CCC
+ CXXCPP
+ F77
+-FFLAGS'
++FFLAGS
++PKG_CONFIG
++fuse_CFLAGS
++fuse_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1722,8 +1729,6 @@
+ --with-python Set location of Python executable
+ --with-pythonconfig Set location of python-config executable
+ --with-tcl directory containing tcl configuration (tclConfig.sh)
+- --with-fuseinclude=DIR FUSE-include from [/usr/local/include]
+- --with-fuselib=DIR FUSE-lib from [/usr/local/lib]
+ --with-libusb-config=PATH Specify full path to libusb-config
+
+ Some influential environment variables:
+@@ -1740,6 +1745,9 @@
+ CXXCPP C++ preprocessor
+ F77 Fortran 77 compiler command
+ FFLAGS Fortran 77 compiler flags
++ PKG_CONFIG path to pkg-config utility
++ fuse_CFLAGS C compiler flags for fuse, overriding pkg-config
++ fuse_LIBS linker flags for fuse, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -5142,7 +5150,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -5237,7 +5245,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -5358,7 +5366,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5361 "configure"' > conftest.$ac_ext
++ echo '#line 5369 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -5423,7 +5431,6 @@
+ esac
+ ;;
+ *64-bit*)
+- libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -5531,7 +5538,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -7188,7 +7199,6 @@
+
+
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+ # find the maximum length of command line arguments
+ { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+@@ -7503,7 +7513,7 @@
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -8063,6 +8073,318 @@
+ ;;
+ esac
+
++
++ case $host_os in
++ rhapsody* | darwin*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$DSYMUTIL"; then
++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++ ac_ct_DSYMUTIL=$DSYMUTIL
++ # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_DSYMUTIL"; then
++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_DSYMUTIL" = x; then
++ DSYMUTIL=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ DSYMUTIL=$ac_ct_DSYMUTIL
++ fi
++else
++ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++fi
++
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
++set dummy ${ac_tool_prefix}nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$NMEDIT"; then
++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_NMEDIT"; then
++ ac_ct_NMEDIT=$NMEDIT
++ # Extract the first word of "nmedit", so it can be a program name with args.
++set dummy nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_NMEDIT"; then
++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_NMEDIT="nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_NMEDIT" = x; then
++ NMEDIT=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ NMEDIT=$ac_ct_NMEDIT
++ fi
++else
++ NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ lt_cv_ld_exported_symbols_list=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++ case $host_os in
++ rhapsody* | darwin1.[0123])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++
++
+ enable_dlopen=yes
+ enable_win32_dll=yes
+
+@@ -8128,7 +8450,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+
+@@ -8156,11 +8478,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8159: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8481: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8163: \$? = $ac_status" >&5
++ echo "$as_me:8485: \$? = $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.
+@@ -8430,10 +8752,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works=no
++ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+@@ -8446,27 +8768,27 @@
+ -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:8449: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8771: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8453: \$? = $ac_status" >&5
++ echo "$as_me:8775: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works=yes
++ lt_cv_prog_compiler_pic_works=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -8493,10 +8815,10 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works=no
++ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -8509,20 +8831,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+-if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+ else
+ lt_prog_compiler_static=
+@@ -8550,11 +8872,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8553: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8875: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8557: \$? = $ac_status" >&5
++ echo "$as_me:8879: \$? = $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
+@@ -8634,12 +8956,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -8698,7 +9021,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -8814,12 +9137,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs=no
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -8917,7 +9241,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -8937,7 +9261,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -9209,11 +9533,10 @@
+ link_all_deplibs=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -9363,7 +9686,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -9733,7 +10056,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -10058,13 +10381,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -10076,6 +10397,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -10257,6 +10590,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -10576,7 +10924,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+@@ -10852,7 +11200,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+
+@@ -10901,7 +11249,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 10904 "configure"
++#line 11252 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11001,7 +11349,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11004 "configure"
++#line 11352 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11128,7 +11476,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -11184,6 +11532,7 @@
+ predeps \
+ postdeps \
+ compiler_lib_search_path \
++ compiler_lib_search_dirs \
+ archive_cmds \
+ archive_expsym_cmds \
+ postinstall_cmds \
+@@ -11244,7 +11593,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -11480,6 +11829,10 @@
+ # shared library.
+ postdeps=$lt_postdeps
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path
+@@ -11728,6 +12081,7 @@
+ predeps_CXX=
+ postdeps_CXX=
+ compiler_lib_search_path_CXX=
++compiler_lib_search_dirs_CXX=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -11765,7 +12119,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -11972,7 +12326,7 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -11985,7 +12339,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -12243,51 +12597,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -12538,7 +12864,7 @@
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -12611,7 +12937,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -12945,7 +13271,6 @@
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+
+-
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+@@ -13047,6 +13372,11 @@
+
+ $rm -f confest.$objext
+
++compiler_lib_search_dirs_CXX=
++if test -n "$compiler_lib_search_path_CXX"; then
++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+ interix[3-9]*)
+@@ -13102,7 +13432,6 @@
+ ;;
+ esac
+
+-
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13178,7 +13507,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -13274,7 +13603,7 @@
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fpic'
+@@ -13312,7 +13641,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -13405,10 +13734,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_CXX=no
++ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+@@ -13421,27 +13750,27 @@
+ -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:13424: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13753: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13428: \$? = $ac_status" >&5
++ echo "$as_me:13757: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_CXX=yes
++ lt_cv_prog_compiler_pic_works_CXX=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -13468,10 +13797,10 @@
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_CXX=no
++ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -13484,20 +13813,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ else
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_CXX=
+@@ -13525,11 +13854,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13528: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13857: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13532: \$? = $ac_status" >&5
++ echo "$as_me:13861: \$? = $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
+@@ -13582,7 +13911,7 @@
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -13597,10 +13926,14 @@
+ cygwin* | mingw*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -13702,7 +14035,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14026,13 +14359,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14044,6 +14375,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -14225,6 +14568,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -14308,6 +14666,7 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
++ compiler_lib_search_dirs_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
+@@ -14556,6 +14915,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_CXX
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+@@ -14770,7 +15133,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -14808,7 +15171,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -15073,10 +15436,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_F77=no
++ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+@@ -15089,27 +15452,27 @@
+ -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:15092: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15455: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15096: \$? = $ac_status" >&5
++ echo "$as_me:15459: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_F77=yes
++ lt_cv_prog_compiler_pic_works_F77=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -15136,10 +15499,10 @@
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_F77=no
++ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -15152,20 +15515,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ else
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_F77=
+@@ -15193,11 +15556,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15196: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15559: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15200: \$? = $ac_status" >&5
++ echo "$as_me:15563: \$? = $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
+@@ -15277,12 +15640,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -15341,7 +15705,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+@@ -15457,12 +15821,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -15560,7 +15925,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -15580,7 +15945,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -15832,11 +16197,10 @@
+ link_all_deplibs_F77=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -15986,7 +16350,7 @@
+ link_all_deplibs_F77=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -16305,7 +16669,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -16629,13 +16993,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16647,6 +17009,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -16828,6 +17202,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -16911,6 +17300,7 @@
+ predeps_F77 \
+ postdeps_F77 \
+ compiler_lib_search_path_F77 \
++ compiler_lib_search_dirs_F77 \
+ archive_cmds_F77 \
+ archive_expsym_cmds_F77 \
+ postinstall_cmds_F77 \
+@@ -17159,6 +17549,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_F77
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -17333,7 +17727,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -17382,11 +17776,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17385: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17779: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17389: \$? = $ac_status" >&5
++ echo "$as_me:17783: \$? = $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.
+@@ -17446,7 +17840,7 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ darwin* | rhapsody*)
+@@ -17516,7 +17910,7 @@
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -17656,10 +18050,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_GCJ=no
++ lt_cv_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+@@ -17672,27 +18066,27 @@
+ -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:17675: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18069: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17679: \$? = $ac_status" >&5
++ echo "$as_me:18073: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_GCJ=yes
++ lt_cv_prog_compiler_pic_works_GCJ=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -17719,10 +18113,10 @@
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_GCJ=no
++ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -17735,20 +18129,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ else
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_GCJ=
+@@ -17776,11 +18170,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17779: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18173: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17783: \$? = $ac_status" >&5
++ echo "$as_me:18177: \$? = $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
+@@ -17860,12 +18254,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -17924,7 +18319,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_GCJ=no
+@@ -18040,12 +18435,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -18143,7 +18539,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -18163,7 +18559,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -18435,11 +18831,10 @@
+ link_all_deplibs_GCJ=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -18589,7 +18984,7 @@
+ link_all_deplibs_GCJ=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -18908,7 +19303,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -19232,13 +19627,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -19250,6 +19643,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -19431,6 +19836,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -19514,6 +19934,7 @@
+ predeps_GCJ \
+ postdeps_GCJ \
+ compiler_lib_search_path_GCJ \
++ compiler_lib_search_dirs_GCJ \
+ archive_cmds_GCJ \
+ archive_expsym_cmds_GCJ \
+ postinstall_cmds_GCJ \
+@@ -19762,6 +20183,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -19935,7 +20360,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -19995,6 +20420,7 @@
+ predeps_RC \
+ postdeps_RC \
+ compiler_lib_search_path_RC \
++ compiler_lib_search_dirs_RC \
+ archive_cmds_RC \
+ archive_expsym_cmds_RC \
+ postinstall_cmds_RC \
+@@ -20243,6 +20669,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_RC
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -22103,9 +22533,8 @@
+ enableval=$enable_owftpd;
+ if test ! "$enableval" = "yes" ; then
+ ENABLE_OWFTPD="false"
+- { { echo "$as_me:$LINENO: error: no" >&5
+-echo "$as_me: error: no" >&2;}
+- { (exit 1); exit 1; }; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+ if test ! "${ENABLE_MT}" = "true" ; then
+ { { echo "$as_me:$LINENO: error: owftpd needs multithreading" >&5
+@@ -24354,24 +24783,204 @@
+ { echo "$as_me:$LINENO: WARNING: LD_EXTRALIBS=${LD_EXTRALIBS} OSLIBS=${OSLIBS}" >&5
+ echo "$as_me: WARNING: LD_EXTRALIBS=${LD_EXTRALIBS} OSLIBS=${OSLIBS}" >&2;}
+
++# check for fuse
++REQUIRES_FUSE="fuse >= 2.2.0"
++
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ PKG_CONFIG=""
++ fi
++
++fi
+
+-# Check whether --with-fuseinclude was given.
+-if test "${with_fuseinclude+set}" = set; then
+- withval=$with_fuseinclude; fuse_include_path=$withval
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for fuse" >&5
++echo $ECHO_N "checking for fuse... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$fuse_CFLAGS"; then
++ pkg_cv_fuse_CFLAGS="$fuse_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${REQUIRES_FUSE}\"") >&5
++ ($PKG_CONFIG --exists --print-errors "${REQUIRES_FUSE}") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_fuse_CFLAGS=`$PKG_CONFIG --cflags "${REQUIRES_FUSE}" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$fuse_LIBS"; then
++ pkg_cv_fuse_LIBS="$fuse_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${REQUIRES_FUSE}\"") >&5
++ ($PKG_CONFIG --exists --print-errors "${REQUIRES_FUSE}") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_fuse_LIBS=`$PKG_CONFIG --libs "${REQUIRES_FUSE}" 2>/dev/null`
+ else
+- fuse_include_path='/usr/local/include'
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
++if test $pkg_failed = yes; then
+
+-# Check whether --with-fuselib was given.
+-if test "${with_fuselib+set}" = set; then
+- withval=$with_fuselib; fuse_lib_path=$withval
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- fuse_lib_path='/usr/local/lib'
++ _pkg_short_errors_supported=no
+ fi
++ if test $_pkg_short_errors_supported = yes; then
++ fuse_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${REQUIRES_FUSE}"`
++ else
++ fuse_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${REQUIRES_FUSE}"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$fuse_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ { echo "$as_me:$LINENO: result: *** ${REQUIRES_FUSE} not found by pkg-config on your system" >&5
++echo "${ECHO_T}*** ${REQUIRES_FUSE} not found by pkg-config on your system" >&6; }
++
++elif test $pkg_failed = untried; then
++ { echo "$as_me:$LINENO: result: *** ${REQUIRES_FUSE} not found by pkg-config on your system" >&5
++echo "${ECHO_T}*** ${REQUIRES_FUSE} not found by pkg-config on your system" >&6; }
++
++else
++ fuse_CFLAGS=$pkg_cv_fuse_CFLAGS
++ fuse_LIBS=$pkg_cv_fuse_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+
+
+
+@@ -24406,9 +25015,9 @@
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ FUSE_FLAGS="-DFUSE_USE_VERSION=26"
+- FUSE_INCLUDES="-I${fuse_include_path}"
+- FUSE_LIBS="-L${fuse_lib_path}"
+- LD_EXTRALIBS="$save_LD_EXTRALIBS -Wl,--rpath -Wl,${fuse_lib_path}"
++ FUSE_INCLUDES="${fuse_CFLAGS}"
++ FUSE_LIBS="${fuse_LIBS}"
++ LD_EXTRALIBS="$save_LD_EXTRALIBS ${fuse_LIBS}"
+ CPPFLAGS="$save_CPPFLAGS -D_FILE_OFFSET_BITS=64 $FUSE_FLAGS $FUSE_INCLUDES"
+ LDFLAGS="$save_LDFLAGS $FUSE_LIBS"
+
+@@ -27541,6 +28150,7 @@
+ # endif
+ #endif
+
++#include <limits.h>
+ #include <stdlib.h>
+
+ #ifdef HAVE_UNISTD_H
+@@ -27689,12 +28299,15 @@
+ isn't worth using anyway. */
+ alarm (60);
+
+- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+- continue;
+- time_t_max--;
+- if ((time_t) -1 < 0)
+- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+- continue;
++ for (;;)
++ {
++ t = (time_t_max << 1) + 1;
++ if (t <= time_t_max)
++ break;
++ time_t_max = t;
++ }
++ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
++
+ delta = time_t_max / 997; /* a suitable prime number */
+ for (i = 0; i < N_STRINGS; i++)
+ {
+@@ -27709,10 +28322,12 @@
+ && mktime_test ((time_t) (60 * 60 * 24))))
+ return 1;
+
+- for (j = 1; 0 < j; j *= 2)
++ for (j = 1; ; j <<= 1)
+ if (! bigtime_test (j))
+ return 1;
+- if (! bigtime_test (j - 1))
++ else if (INT_MAX / 2 < j)
++ break;
++ if (! bigtime_test (INT_MAX))
+ return 1;
+ }
+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+@@ -29956,6 +30571,8 @@
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ AR!$AR$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+ DLLTOOL!$DLLTOOL$ac_delim
+ AS!$AS$ac_delim
+ OBJDUMP!$OBJDUMP$ac_delim
+@@ -30039,8 +30656,6 @@
+ ENABLE_OWCAPI_TRUE!$ENABLE_OWCAPI_TRUE$ac_delim
+ ENABLE_OWCAPI_FALSE!$ENABLE_OWCAPI_FALSE$ac_delim
+ ENABLE_SWIG!$ENABLE_SWIG$ac_delim
+-ENABLE_SWIG_TRUE!$ENABLE_SWIG_TRUE$ac_delim
+-ENABLE_SWIG_FALSE!$ENABLE_SWIG_FALSE$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -30082,6 +30697,8 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++ENABLE_SWIG_TRUE!$ENABLE_SWIG_TRUE$ac_delim
++ENABLE_SWIG_FALSE!$ENABLE_SWIG_FALSE$ac_delim
+ PERL!$PERL$ac_delim
+ PERL5EXT!$PERL5EXT$ac_delim
+ PERL5DYNAMICLINKING!$PERL5DYNAMICLINKING$ac_delim
+@@ -30158,8 +30775,10 @@
+ ENABLE_PROFILING_FALSE!$ENABLE_PROFILING_FALSE$ac_delim
+ LD_EXTRALIBS!$LD_EXTRALIBS$ac_delim
+ OSLIBS!$OSLIBS$ac_delim
+-fuse_include_path!$fuse_include_path$ac_delim
+-fuse_lib_path!$fuse_lib_path$ac_delim
++REQUIRES_FUSE!$REQUIRES_FUSE$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++fuse_CFLAGS!$fuse_CFLAGS$ac_delim
++fuse_LIBS!$fuse_LIBS$ac_delim
+ FUSE_LIBS!$FUSE_LIBS$ac_delim
+ FUSE_FLAGS!$FUSE_FLAGS$ac_delim
+ FUSE_INCLUDES!$FUSE_INCLUDES$ac_delim
+@@ -30175,10 +30794,6 @@
+ LIBUSB_CONFIG!$LIBUSB_CONFIG$ac_delim
+ LIBUSB_CFLAGS!$LIBUSB_CFLAGS$ac_delim
+ LIBUSB_LIBS!$LIBUSB_LIBS$ac_delim
+-ENABLE_USB!$ENABLE_USB$ac_delim
+-ENABLE_USB_TRUE!$ENABLE_USB_TRUE$ac_delim
+-ENABLE_USB_FALSE!$ENABLE_USB_FALSE$ac_delim
+-ENABLE_PARPORT!$ENABLE_PARPORT$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -30220,6 +30835,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++ENABLE_USB!$ENABLE_USB$ac_delim
++ENABLE_USB_TRUE!$ENABLE_USB_TRUE$ac_delim
++ENABLE_USB_FALSE!$ENABLE_USB_FALSE$ac_delim
++ENABLE_PARPORT!$ENABLE_PARPORT$ac_delim
+ ENABLE_PARPORT_TRUE!$ENABLE_PARPORT_TRUE$ac_delim
+ ENABLE_PARPORT_FALSE!$ENABLE_PARPORT_FALSE$ac_delim
+ OW_CYGWIN!$OW_CYGWIN$ac_delim
+@@ -30239,7 +30858,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -ur owfs-2.7p7-orig/Makefile.in owfs-2.7p7/Makefile.in
+--- owfs-2.7p7-orig/Makefile.in 2008-09-29 16:25:16.000000000 +0200
++++ owfs-2.7p7/Makefile.in 2008-11-01 12:29:16.000000000 +0100
+@@ -117,6 +117,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -188,6 +189,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -227,6 +229,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -240,6 +243,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -303,8 +307,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/Makefile.in owfs-2.7p7/module/Makefile.in
+--- owfs-2.7p7-orig/module/Makefile.in 2008-09-29 16:25:10.000000000 +0200
++++ owfs-2.7p7/module/Makefile.in 2008-11-01 12:29:11.000000000 +0100
+@@ -87,6 +87,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -158,6 +159,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -197,6 +199,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -210,6 +213,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -273,8 +277,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owcapi/Makefile.in owfs-2.7p7/module/owcapi/Makefile.in
+--- owfs-2.7p7-orig/module/owcapi/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owcapi/Makefile.in 2008-11-01 12:29:11.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owcapi/src/c/Makefile.in owfs-2.7p7/module/owcapi/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owcapi/src/c/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owcapi/src/c/Makefile.in 2008-11-01 12:29:11.000000000 +0100
+@@ -106,6 +106,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -177,6 +178,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -216,6 +218,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -229,6 +232,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -292,8 +296,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owcapi/src/include/Makefile.in owfs-2.7p7/module/owcapi/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owcapi/src/include/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owcapi/src/include/Makefile.in 2008-11-01 12:29:11.000000000 +0100
+@@ -84,6 +84,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -155,6 +156,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -194,6 +196,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -207,6 +210,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -270,8 +274,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owcapi/src/Makefile.in owfs-2.7p7/module/owcapi/src/Makefile.in
+--- owfs-2.7p7-orig/module/owcapi/src/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owcapi/src/Makefile.in 2008-11-01 12:29:11.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owfs/Makefile.in owfs-2.7p7/module/owfs/Makefile.in
+--- owfs-2.7p7-orig/module/owfs/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owfs/Makefile.in 2008-11-01 12:29:11.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owfs/src/c/Makefile.in owfs-2.7p7/module/owfs/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owfs/src/c/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owfs/src/c/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -100,6 +100,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -171,6 +172,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -210,6 +212,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -223,6 +226,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -286,8 +290,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owfs/src/include/Makefile.in owfs-2.7p7/module/owfs/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owfs/src/include/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owfs/src/include/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -79,6 +79,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,6 +151,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -189,6 +191,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -202,6 +205,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -265,8 +269,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owfs/src/Makefile.in owfs-2.7p7/module/owfs/src/Makefile.in
+--- owfs-2.7p7-orig/module/owfs/src/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owfs/src/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owftpd/Makefile.in owfs-2.7p7/module/owftpd/Makefile.in
+--- owfs-2.7p7-orig/module/owftpd/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owftpd/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -87,6 +87,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -158,6 +159,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -197,6 +199,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -210,6 +213,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -273,8 +277,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owftpd/src/c/Makefile.in owfs-2.7p7/module/owftpd/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owftpd/src/c/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owftpd/src/c/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -103,6 +103,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -174,6 +175,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -213,6 +215,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -226,6 +229,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -289,8 +293,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owftpd/src/include/Makefile.in owfs-2.7p7/module/owftpd/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owftpd/src/include/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owftpd/src/include/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -79,6 +79,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,6 +151,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -189,6 +191,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -202,6 +205,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -265,8 +269,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owftpd/src/Makefile.in owfs-2.7p7/module/owftpd/src/Makefile.in
+--- owfs-2.7p7-orig/module/owftpd/src/Makefile.in 2008-09-29 16:25:11.000000000 +0200
++++ owfs-2.7p7/module/owftpd/src/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owhttpd/Makefile.in owfs-2.7p7/module/owhttpd/Makefile.in
+--- owfs-2.7p7-orig/module/owhttpd/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owhttpd/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owhttpd/src/c/Makefile.in owfs-2.7p7/module/owhttpd/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owhttpd/src/c/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owhttpd/src/c/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -102,6 +102,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -173,6 +174,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -212,6 +214,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -225,6 +228,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -288,8 +292,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owhttpd/src/include/Makefile.in owfs-2.7p7/module/owhttpd/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owhttpd/src/include/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owhttpd/src/include/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -79,6 +79,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,6 +151,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -189,6 +191,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -202,6 +205,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -265,8 +269,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owhttpd/src/Makefile.in owfs-2.7p7/module/owhttpd/src/Makefile.in
+--- owfs-2.7p7-orig/module/owhttpd/src/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owhttpd/src/Makefile.in 2008-11-01 12:29:12.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owlib/Makefile.in owfs-2.7p7/module/owlib/Makefile.in
+--- owfs-2.7p7-orig/module/owlib/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owlib/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owlib/src/c/Makefile.in owfs-2.7p7/module/owlib/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owlib/src/c/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owlib/src/c/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -133,6 +133,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -204,6 +205,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -243,6 +245,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -256,6 +259,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -319,8 +323,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owlib/src/include/Makefile.in owfs-2.7p7/module/owlib/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owlib/src/include/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owlib/src/include/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -79,6 +79,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,6 +151,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -189,6 +191,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -202,6 +205,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -265,8 +269,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owlib/src/Makefile.in owfs-2.7p7/module/owlib/src/Makefile.in
+--- owfs-2.7p7-orig/module/owlib/src/Makefile.in 2008-09-29 16:25:12.000000000 +0200
++++ owfs-2.7p7/module/owlib/src/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owmon/Makefile.in owfs-2.7p7/module/owmon/Makefile.in
+--- owfs-2.7p7-orig/module/owmon/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/owmon/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -76,6 +76,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,6 +148,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -186,6 +188,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -199,6 +202,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -262,8 +266,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/c/Makefile.in owfs-2.7p7/module/ownet/c/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/c/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/c/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/c/src/c/Makefile.in owfs-2.7p7/module/ownet/c/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/c/src/c/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/c/src/c/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -111,6 +111,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -182,6 +183,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -221,6 +223,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -234,6 +237,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -297,8 +301,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/c/src/include/Makefile.in owfs-2.7p7/module/ownet/c/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/c/src/include/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/c/src/include/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -84,6 +84,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -155,6 +156,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -194,6 +196,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -207,6 +210,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -270,8 +274,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/c/src/Makefile.in owfs-2.7p7/module/ownet/c/src/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/c/src/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/c/src/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/Makefile.in owfs-2.7p7/module/ownet/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/perl5/Makefile.in owfs-2.7p7/module/ownet/perl5/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/perl5/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/perl5/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -74,6 +74,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,6 +146,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -184,6 +186,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -197,6 +200,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -260,8 +264,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/php/Makefile.in owfs-2.7p7/module/ownet/php/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/php/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/php/Makefile.in 2008-11-01 12:29:13.000000000 +0100
+@@ -74,6 +74,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,6 +146,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -184,6 +186,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -197,6 +200,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -260,8 +264,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/ownet/python/Makefile.in owfs-2.7p7/module/ownet/python/Makefile.in
+--- owfs-2.7p7-orig/module/ownet/python/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/ownet/python/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -74,6 +74,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,6 +146,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -184,6 +186,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -197,6 +200,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -260,8 +264,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owserver/Makefile.in owfs-2.7p7/module/owserver/Makefile.in
+--- owfs-2.7p7-orig/module/owserver/Makefile.in 2008-09-29 16:25:13.000000000 +0200
++++ owfs-2.7p7/module/owserver/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owserver/src/c/Makefile.in owfs-2.7p7/module/owserver/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owserver/src/c/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owserver/src/c/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -102,6 +102,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -173,6 +174,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -212,6 +214,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -225,6 +228,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -288,8 +292,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owserver/src/include/Makefile.in owfs-2.7p7/module/owserver/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owserver/src/include/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owserver/src/include/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -79,6 +79,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,6 +151,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -189,6 +191,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -202,6 +205,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -265,8 +269,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owserver/src/Makefile.in owfs-2.7p7/module/owserver/src/Makefile.in
+--- owfs-2.7p7-orig/module/owserver/src/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owserver/src/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owshell/Makefile.in owfs-2.7p7/module/owshell/Makefile.in
+--- owfs-2.7p7-orig/module/owshell/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owshell/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owshell/src/c/Makefile.in owfs-2.7p7/module/owshell/src/c/Makefile.in
+--- owfs-2.7p7-orig/module/owshell/src/c/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owshell/src/c/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -119,6 +119,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -190,6 +191,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -229,6 +231,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -242,6 +245,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -305,8 +309,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owshell/src/include/Makefile.in owfs-2.7p7/module/owshell/src/include/Makefile.in
+--- owfs-2.7p7-orig/module/owshell/src/include/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owshell/src/include/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -79,6 +79,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,6 +151,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -189,6 +191,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -202,6 +205,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -265,8 +269,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owshell/src/Makefile.in owfs-2.7p7/module/owshell/src/Makefile.in
+--- owfs-2.7p7-orig/module/owshell/src/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owshell/src/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owside/Makefile.in owfs-2.7p7/module/owside/Makefile.in
+--- owfs-2.7p7-orig/module/owside/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owside/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -76,6 +76,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,6 +148,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -186,6 +188,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -199,6 +202,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -262,8 +266,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/owtap/Makefile.in owfs-2.7p7/module/owtap/Makefile.in
+--- owfs-2.7p7-orig/module/owtap/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/owtap/Makefile.in 2008-11-01 12:29:14.000000000 +0100
+@@ -76,6 +76,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,6 +148,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -186,6 +188,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -199,6 +202,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -262,8 +266,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/swig/Makefile.in owfs-2.7p7/module/swig/Makefile.in
+--- owfs-2.7p7-orig/module/swig/Makefile.in 2008-09-29 16:25:14.000000000 +0200
++++ owfs-2.7p7/module/swig/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -88,6 +88,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -159,6 +160,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -198,6 +200,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -211,6 +214,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -274,8 +278,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/swig/perl5/Makefile.in owfs-2.7p7/module/swig/perl5/Makefile.in
+--- owfs-2.7p7-orig/module/swig/perl5/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/module/swig/perl5/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -74,6 +74,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,6 +146,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -184,6 +186,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -197,6 +200,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -260,8 +264,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/swig/php/Makefile.in owfs-2.7p7/module/swig/php/Makefile.in
+--- owfs-2.7p7-orig/module/swig/php/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/module/swig/php/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -105,6 +105,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -176,6 +177,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -215,6 +217,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -228,6 +231,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -291,8 +295,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/swig/python/Makefile.in owfs-2.7p7/module/swig/python/Makefile.in
+--- owfs-2.7p7-orig/module/swig/python/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/module/swig/python/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -91,6 +91,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -162,6 +163,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -201,6 +203,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -214,6 +217,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -277,8 +281,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/swig/python/ow/Makefile.in owfs-2.7p7/module/swig/python/ow/Makefile.in
+--- owfs-2.7p7-orig/module/swig/python/ow/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/module/swig/python/ow/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -74,6 +74,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,6 +146,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -184,6 +186,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -197,6 +200,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -260,8 +264,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/module/swig/tcl/Makefile.in owfs-2.7p7/module/swig/tcl/Makefile.in
+--- owfs-2.7p7-orig/module/swig/tcl/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/module/swig/tcl/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -110,6 +110,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -183,6 +184,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -222,6 +224,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -235,6 +238,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -299,8 +303,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/include/Makefile.in owfs-2.7p7/src/include/Makefile.in
+--- owfs-2.7p7-orig/src/include/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/src/include/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -88,6 +88,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -159,6 +160,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -198,6 +200,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -211,6 +214,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -274,8 +278,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/Makefile.in owfs-2.7p7/src/Makefile.in
+--- owfs-2.7p7-orig/src/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/src/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/man/Makefile.in owfs-2.7p7/src/man/Makefile.in
+--- owfs-2.7p7-orig/src/man/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/src/man/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -82,6 +82,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -153,6 +154,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -192,6 +194,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -205,6 +208,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -268,8 +272,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/rpm/Makefile.in owfs-2.7p7/src/rpm/Makefile.in
+--- owfs-2.7p7-orig/src/rpm/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/src/rpm/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -77,6 +77,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -148,6 +149,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -187,6 +189,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -200,6 +203,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -263,8 +267,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/scripts/Makefile.in owfs-2.7p7/src/scripts/Makefile.in
+--- owfs-2.7p7-orig/src/scripts/Makefile.in 2008-09-29 16:25:15.000000000 +0200
++++ owfs-2.7p7/src/scripts/Makefile.in 2008-11-01 12:29:15.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/scripts/usb/cygwin/Makefile.in owfs-2.7p7/src/scripts/usb/cygwin/Makefile.in
+--- owfs-2.7p7-orig/src/scripts/usb/cygwin/Makefile.in 2008-09-29 16:25:16.000000000 +0200
++++ owfs-2.7p7/src/scripts/usb/cygwin/Makefile.in 2008-11-01 12:29:16.000000000 +0100
+@@ -84,6 +84,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -155,6 +156,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -194,6 +196,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -207,6 +210,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -270,8 +274,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/scripts/usb/Makefile.in owfs-2.7p7/src/scripts/usb/Makefile.in
+--- owfs-2.7p7-orig/src/scripts/usb/Makefile.in 2008-09-29 16:25:16.000000000 +0200
++++ owfs-2.7p7/src/scripts/usb/Makefile.in 2008-11-01 12:29:16.000000000 +0100
+@@ -86,6 +86,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -196,6 +198,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -209,6 +212,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -272,8 +276,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/scripts/usb/windows/Makefile.in owfs-2.7p7/src/scripts/usb/windows/Makefile.in
+--- owfs-2.7p7-orig/src/scripts/usb/windows/Makefile.in 2008-09-29 16:25:16.000000000 +0200
++++ owfs-2.7p7/src/scripts/usb/windows/Makefile.in 2008-11-01 12:29:16.000000000 +0100
+@@ -74,6 +74,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,6 +146,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -184,6 +186,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -197,6 +200,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -260,8 +264,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+diff -ur owfs-2.7p7-orig/src/scripts/windows/Makefile.in owfs-2.7p7/src/scripts/windows/Makefile.in
+--- owfs-2.7p7-orig/src/scripts/windows/Makefile.in 2008-09-29 16:25:16.000000000 +0200
++++ owfs-2.7p7/src/scripts/windows/Makefile.in 2008-11-01 12:29:16.000000000 +0100
+@@ -75,6 +75,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,6 +147,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OSLIBS = @OSLIBS@
+@@ -185,6 +187,7 @@
+ PHPINC = @PHPINC@
+ PHPLIBDIR = @PHPLIBDIR@
+ PIC_FLAGS = @PIC_FLAGS@
++PKG_CONFIG = @PKG_CONFIG@
+ POW_LIB = @POW_LIB@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -198,6 +201,7 @@
+ PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+ PYVERSION = @PYVERSION@
+ RANLIB = @RANLIB@
++REQUIRES_FUSE = @REQUIRES_FUSE@
+ RM = @RM@
+ RPM = @RPM@
+ RPMBUILD = @RPMBUILD@
+@@ -261,8 +265,8 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-fuse_include_path = @fuse_include_path@
+-fuse_lib_path = @fuse_lib_path@
++fuse_CFLAGS = @fuse_CFLAGS@
++fuse_LIBS = @fuse_LIBS@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@