summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJochen Frieling <j.frieling@pengutronix.de>2008-11-01 11:32:39 +0000
committerJochen Frieling <j.frieling@pengutronix.de>2008-11-01 11:32:39 +0000
commit69497f755fa606e9796ebd72808df4446dd87355 (patch)
tree80ff87bd84495337d1409b0d7da33c56c900ea36
parenteb5fec2438431eb8950f00cbf8b58fd0f3595bd6 (diff)
downloadptxdist-69497f755fa606e9796ebd72808df4446dd87355.tar.gz
ptxdist-69497f755fa606e9796ebd72808df4446dd87355.tar.xz
* owfs: use pkg-config to find out about libfuse dependencies. This
fixes the problem that, if libfuse requires libiconv, the previous configure script failed. git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9021 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat
-rw-r--r--patches/owfs-2.7p7/generic/owfs-2.7p7-autogen.diff2362
-rw-r--r--patches/owfs-2.7p7/generic/owfs-2.7p7-pkgconfigize-fuse.diff50
-rw-r--r--patches/owfs-2.7p7/generic/series1
3 files changed, 2214 insertions, 199 deletions
diff --git a/patches/owfs-2.7p7/generic/owfs-2.7p7-autogen.diff b/patches/owfs-2.7p7/generic/owfs-2.7p7-autogen.diff
index 5e25df343..b8494edec 100644
--- a/patches/owfs-2.7p7/generic/owfs-2.7p7-autogen.diff
+++ b/patches/owfs-2.7p7/generic/owfs-2.7p7-autogen.diff
@@ -1,6 +1,6 @@
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 11:52:07.483887268 +0100
++++ 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-*-
@@ -604,10 +604,175 @@ diff -ur owfs-2.7p7-orig/aclocal.m4 owfs-2.7p7/aclocal.m4
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 11:52:10.039867148 +0100
++++ owfs-2.7p7/configure 2008-11-01 12:29:10.000000000 +0100
@@ -879,6 +879,8 @@
GREP
EGREP
@@ -617,7 +782,51 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
DLLTOOL
AS
OBJDUMP
-@@ -5142,7 +5144,7 @@
+@@ -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
@@ -626,7 +835,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5237,7 +5239,7 @@
+@@ -5237,7 +5245,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -635,16 +844,16 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +5360,7 @@
+@@ -5358,7 +5366,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5361 "configure"' > conftest.$ac_ext
-+ echo '#line 5363 "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 +5425,6 @@
+@@ -5423,7 +5431,6 @@
esac
;;
*64-bit*)
@@ -652,7 +861,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -5531,7 +5532,11 @@
+@@ -5531,7 +5538,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -665,7 +874,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
esac
;;
esac
-@@ -7188,7 +7193,6 @@
+@@ -7188,7 +7199,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -673,7 +882,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +7507,7 @@
+@@ -7503,7 +7513,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -682,7 +891,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -8063,6 +8067,318 @@
+@@ -8063,6 +8073,318 @@
;;
esac
@@ -1001,7 +1210,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
enable_dlopen=yes
enable_win32_dll=yes
-@@ -8128,7 +8444,7 @@
+@@ -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`
@@ -1010,21 +1219,21 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
-@@ -8156,11 +8472,11 @@
+@@ -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:8475: $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:8479: \$? = $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 +8746,10 @@
+@@ -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; }
@@ -1037,17 +1246,17 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -8446,27 +8762,27 @@
+@@ -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:8765: $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:8769: \$? = $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.
@@ -1071,7 +1280,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -8493,10 +8809,10 @@
+@@ -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; }
@@ -1084,7 +1293,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -8509,20 +8825,20 @@
+@@ -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
@@ -1111,21 +1320,21 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
:
else
lt_prog_compiler_static=
-@@ -8550,11 +8866,11 @@
+@@ -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:8869: $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:8873: \$? = $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 +8950,13 @@
+@@ -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'.
@@ -1140,7 +1349,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8698,7 +9015,7 @@
+@@ -8698,7 +9021,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1149,7 +1358,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8814,12 +9131,13 @@
+@@ -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
@@ -1164,7 +1373,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8917,7 +9235,7 @@
+@@ -8917,7 +9241,7 @@
fi
;;
@@ -1173,7 +1382,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +9255,7 @@
+@@ -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.
@@ -1182,7 +1391,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -9209,11 +9527,10 @@
+@@ -9209,11 +9533,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1198,7 +1407,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
else
case $cc_basename in
xlc*)
-@@ -9363,7 +9680,7 @@
+@@ -9363,7 +9686,7 @@
link_all_deplibs=yes
;;
@@ -1207,7 +1416,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +10050,7 @@
+@@ -9733,7 +10056,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1216,7 +1425,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10058,13 +10375,11 @@
+@@ -10058,13 +10381,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -1231,7 +1440,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10076,6 +10391,18 @@
+@@ -10076,6 +10397,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1250,7 +1459,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10257,6 +10584,21 @@
+@@ -10257,6 +10590,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -1272,7 +1481,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +10918,7 @@
+@@ -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
@@ -1281,7 +1490,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10852,7 +11194,7 @@
+@@ -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
@@ -1290,25 +1499,25 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
fi
-@@ -10901,7 +11243,7 @@
+@@ -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 11246 "configure"
++#line 11252 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11001,7 +11343,7 @@
+@@ -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 11346 "configure"
++#line 11352 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11128,7 +11470,7 @@
+@@ -11128,7 +11476,7 @@
fi
;;
@@ -1317,7 +1526,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11184,6 +11526,7 @@
+@@ -11184,6 +11532,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -1325,7 +1534,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -11244,7 +11587,7 @@
+@@ -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.
#
@@ -1334,7 +1543,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11480,6 +11823,10 @@
+@@ -11480,6 +11829,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -1345,7 +1554,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +12075,7 @@
+@@ -11728,6 +12081,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -1353,7 +1562,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11765,7 +12113,7 @@
+@@ -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`
@@ -1362,7 +1571,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Allow CC to be a program name with arguments.
-@@ -11972,7 +12320,7 @@
+@@ -11972,7 +12326,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -1371,7 +1580,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +12333,7 @@
+@@ -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.
@@ -1380,7 +1589,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -12243,51 +12591,23 @@
+@@ -12243,51 +12597,23 @@
fi
;;
darwin* | rhapsody*)
@@ -1441,7 +1650,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
else
case $cc_basename in
xlc*)
-@@ -12538,7 +12858,7 @@
+@@ -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'
;;
@@ -1450,7 +1659,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +12931,7 @@
+@@ -12611,7 +12937,7 @@
;;
esac
;;
@@ -1459,7 +1668,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +13265,6 @@
+@@ -12945,7 +13271,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -1467,7 +1676,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -13047,6 +13366,11 @@
+@@ -13047,6 +13372,11 @@
$rm -f confest.$objext
@@ -1479,7 +1688,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
-@@ -13102,7 +13426,6 @@
+@@ -13102,7 +13432,6 @@
;;
esac
@@ -1487,7 +1696,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13178,7 +13501,7 @@
+@@ -13178,7 +13507,7 @@
esac
else
case $host_os in
@@ -1496,7 +1705,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -13274,7 +13597,7 @@
+@@ -13274,7 +13603,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -1505,7 +1714,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -13312,7 +13635,7 @@
+@@ -13312,7 +13641,7 @@
;;
esac
;;
@@ -1514,7 +1723,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13405,10 +13728,10 @@
+@@ -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; }
@@ -1527,17 +1736,17 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +13744,27 @@
+@@ -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:13747: $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:13751: \$? = $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.
@@ -1561,7 +1770,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13468,10 +13791,10 @@
+@@ -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; }
@@ -1574,7 +1783,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -13484,20 +13807,20 @@
+@@ -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
@@ -1601,21 +1810,21 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
:
else
lt_prog_compiler_static_CXX=
-@@ -13525,11 +13848,11 @@
+@@ -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:13851: $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:13855: \$? = $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 +13905,7 @@
+@@ -13582,7 +13911,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -1624,7 +1833,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +13920,14 @@
+@@ -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'
;;
@@ -1639,7 +1848,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -13702,7 +14029,7 @@
+@@ -13702,7 +14035,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1648,7 +1857,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14026,13 +14353,11 @@
+@@ -14026,13 +14359,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -1663,7 +1872,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14044,6 +14369,18 @@
+@@ -14044,6 +14375,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1682,7 +1891,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14225,6 +14562,21 @@
+@@ -14225,6 +14568,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -1704,7 +1913,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +14660,7 @@
+@@ -14308,6 +14666,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -1712,7 +1921,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -14556,6 +14909,10 @@
+@@ -14556,6 +14915,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -1723,7 +1932,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +15127,7 @@
+@@ -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`
@@ -1732,7 +1941,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Allow CC to be a program name with arguments.
-@@ -14808,7 +15165,7 @@
+@@ -14808,7 +15171,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1741,7 +1950,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -15073,10 +15430,10 @@
+@@ -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; }
@@ -1754,17 +1963,17 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -15089,27 +15446,27 @@
+@@ -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:15449: $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:15453: \$? = $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.
@@ -1788,7 +1997,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15136,10 +15493,10 @@
+@@ -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; }
@@ -1801,7 +2010,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -15152,20 +15509,20 @@
+@@ -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
@@ -1828,21 +2037,21 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
:
else
lt_prog_compiler_static_F77=
-@@ -15193,11 +15550,11 @@
+@@ -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:15553: $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:15557: \$? = $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 +15634,13 @@
+@@ -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'.
@@ -1857,7 +2066,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15341,7 +15699,7 @@
+@@ -15341,7 +15705,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1866,7 +2075,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -15457,12 +15815,13 @@
+@@ -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
@@ -1881,7 +2090,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15560,7 +15919,7 @@
+@@ -15560,7 +15925,7 @@
fi
;;
@@ -1890,7 +2099,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +15939,7 @@
+@@ -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.
@@ -1899,7 +2108,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -15832,11 +16191,10 @@
+@@ -15832,11 +16197,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1915,7 +2124,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
else
case $cc_basename in
xlc*)
-@@ -15986,7 +16344,7 @@
+@@ -15986,7 +16350,7 @@
link_all_deplibs_F77=yes
;;
@@ -1924,7 +2133,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +16663,7 @@
+@@ -16305,7 +16669,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1933,7 +2142,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16629,13 +16987,11 @@
+@@ -16629,13 +16993,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -1948,7 +2157,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16647,6 +17003,18 @@
+@@ -16647,6 +17009,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1967,7 +2176,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16828,6 +17196,21 @@
+@@ -16828,6 +17202,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -1989,7 +2198,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +17294,7 @@
+@@ -16911,6 +17300,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -1997,7 +2206,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -17159,6 +17543,10 @@
+@@ -17159,6 +17549,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -2008,7 +2217,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +17721,7 @@
+@@ -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`
@@ -2017,21 +2226,21 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Allow CC to be a program name with arguments.
-@@ -17382,11 +17770,11 @@
+@@ -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:17773: $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:17777: \$? = $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 +17834,7 @@
+@@ -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
@@ -2040,7 +2249,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
;;
darwin* | rhapsody*)
-@@ -17516,7 +17904,7 @@
+@@ -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).
@@ -2049,7 +2258,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
;;
hpux9* | hpux10* | hpux11*)
-@@ -17656,10 +18044,10 @@
+@@ -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; }
@@ -2062,17 +2271,17 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -17672,27 +18060,27 @@
+@@ -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:18063: $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:18067: \$? = $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.
@@ -2096,7 +2305,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17719,10 +18107,10 @@
+@@ -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; }
@@ -2109,7 +2318,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -17735,20 +18123,20 @@
+@@ -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
@@ -2136,21 +2345,21 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
:
else
lt_prog_compiler_static_GCJ=
-@@ -17776,11 +18164,11 @@
+@@ -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:18167: $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:18171: \$? = $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 +18248,13 @@
+@@ -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'.
@@ -2165,7 +2374,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17924,7 +18313,7 @@
+@@ -17924,7 +18319,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2174,7 +2383,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -18040,12 +18429,13 @@
+@@ -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
@@ -2189,7 +2398,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18143,7 +18533,7 @@
+@@ -18143,7 +18539,7 @@
fi
;;
@@ -2198,7 +2407,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +18553,7 @@
+@@ -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.
@@ -2207,7 +2416,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -18435,11 +18825,10 @@
+@@ -18435,11 +18831,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2223,7 +2432,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
else
case $cc_basename in
xlc*)
-@@ -18589,7 +18978,7 @@
+@@ -18589,7 +18984,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -2232,7 +2441,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +19297,7 @@
+@@ -18908,7 +19303,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2241,7 +2450,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19232,13 +19621,11 @@
+@@ -19232,13 +19627,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -2256,7 +2465,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19250,6 +19637,18 @@
+@@ -19250,6 +19643,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2275,7 +2484,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19431,6 +19830,21 @@
+@@ -19431,6 +19836,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2297,7 +2506,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
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 +19928,7 @@
+@@ -19514,6 +19934,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -2305,7 +2514,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -19762,6 +20177,10 @@
+@@ -19762,6 +20183,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -2316,7 +2525,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +20354,7 @@
+@@ -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`
@@ -2325,7 +2534,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# Allow CC to be a program name with arguments.
-@@ -19995,6 +20414,7 @@
+@@ -19995,6 +20420,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -2333,7 +2542,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -20243,6 +20663,10 @@
+@@ -20243,6 +20669,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -2344,7 +2553,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
# 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 +22527,8 @@
+@@ -22103,9 +22533,8 @@
enableval=$enable_owftpd;
if test ! "$enableval" = "yes" ; then
ENABLE_OWFTPD="false"
@@ -2356,7 +2565,233 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
else
if test ! "${ENABLE_MT}" = "true" ; then
{ { echo "$as_me:$LINENO: error: owftpd needs multithreading" >&5
-@@ -27541,6 +27964,7 @@
+@@ -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
@@ -2364,7 +2799,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
-@@ -27689,12 +28113,15 @@
+@@ -27689,12 +28299,15 @@
isn't worth using anyway. */
alarm (60);
@@ -2386,7 +2821,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
delta = time_t_max / 997; /* a suitable prime number */
for (i = 0; i < N_STRINGS; i++)
{
-@@ -27709,10 +28136,12 @@
+@@ -27709,10 +28322,12 @@
&& mktime_test ((time_t) (60 * 60 * 24))))
return 1;
@@ -2401,7 +2836,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
return 1;
}
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
-@@ -29956,6 +30385,8 @@
+@@ -29956,6 +30571,8 @@
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
AR!$AR$ac_delim
@@ -2410,7 +2845,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
DLLTOOL!$DLLTOOL$ac_delim
AS!$AS$ac_delim
OBJDUMP!$OBJDUMP$ac_delim
-@@ -30039,8 +30470,6 @@
+@@ -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
@@ -2419,7 +2854,7 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -30082,6 +30511,8 @@
+@@ -30082,6 +30697,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -2428,36 +2863,53 @@ diff -ur owfs-2.7p7-orig/configure owfs-2.7p7/configure
PERL!$PERL$ac_delim
PERL5EXT!$PERL5EXT$ac_delim
PERL5DYNAMICLINKING!$PERL5DYNAMICLINKING$ac_delim
-@@ -30177,8 +30608,6 @@
+@@ -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!$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 +30649,8 @@
+@@ -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 +30670,7 @@
+@@ -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` = 19; 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 11:52:13.807866992 +0100
++++ owfs-2.7p7/Makefile.in 2008-11-01 12:29:16.000000000 +0100
@@ -117,6 +117,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2474,9 +2926,36 @@ diff -ur owfs-2.7p7-orig/Makefile.in owfs-2.7p7/Makefile.in
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 11:52:10.531866969 +0100
++++ owfs-2.7p7/module/Makefile.in 2008-11-01 12:29:11.000000000 +0100
@@ -87,6 +87,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2493,9 +2972,36 @@ diff -ur owfs-2.7p7-orig/module/Makefile.in owfs-2.7p7/module/Makefile.in
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 11:52:10.587866684 +0100
++++ owfs-2.7p7/module/owcapi/Makefile.in 2008-11-01 12:29:11.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2512,9 +3018,36 @@ diff -ur owfs-2.7p7-orig/module/owcapi/Makefile.in owfs-2.7p7/module/owcapi/Make
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 11:52:10.715866542 +0100
++++ 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@
@@ -2531,9 +3064,36 @@ diff -ur owfs-2.7p7-orig/module/owcapi/src/c/Makefile.in owfs-2.7p7/module/owcap
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 11:52:10.771866677 +0100
++++ 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@
@@ -2550,9 +3110,36 @@ diff -ur owfs-2.7p7-orig/module/owcapi/src/include/Makefile.in owfs-2.7p7/module
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 11:52:10.647866978 +0100
++++ owfs-2.7p7/module/owcapi/src/Makefile.in 2008-11-01 12:29:11.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2569,9 +3156,36 @@ diff -ur owfs-2.7p7-orig/module/owcapi/src/Makefile.in owfs-2.7p7/module/owcapi/
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 11:52:10.827866671 +0100
++++ owfs-2.7p7/module/owfs/Makefile.in 2008-11-01 12:29:11.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2588,9 +3202,36 @@ diff -ur owfs-2.7p7-orig/module/owfs/Makefile.in owfs-2.7p7/module/owfs/Makefile
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 11:52:10.951867068 +0100
++++ 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@
@@ -2607,9 +3248,36 @@ diff -ur owfs-2.7p7-orig/module/owfs/src/c/Makefile.in owfs-2.7p7/module/owfs/sr
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 11:52:11.011866593 +0100
++++ 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@
@@ -2626,9 +3294,36 @@ diff -ur owfs-2.7p7-orig/module/owfs/src/include/Makefile.in owfs-2.7p7/module/o
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 11:52:10.883867085 +0100
++++ owfs-2.7p7/module/owfs/src/Makefile.in 2008-11-01 12:29:12.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2645,9 +3340,36 @@ diff -ur owfs-2.7p7-orig/module/owfs/src/Makefile.in owfs-2.7p7/module/owfs/src/
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 11:52:11.067867007 +0100
++++ owfs-2.7p7/module/owftpd/Makefile.in 2008-11-01 12:29:12.000000000 +0100
@@ -87,6 +87,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2664,9 +3386,36 @@ diff -ur owfs-2.7p7-orig/module/owftpd/Makefile.in owfs-2.7p7/module/owftpd/Make
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 11:52:11.191866984 +0100
++++ 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@
@@ -2683,9 +3432,36 @@ diff -ur owfs-2.7p7-orig/module/owftpd/src/c/Makefile.in owfs-2.7p7/module/owftp
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 11:52:11.247866559 +0100
++++ 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@
@@ -2702,9 +3478,36 @@ diff -ur owfs-2.7p7-orig/module/owftpd/src/include/Makefile.in owfs-2.7p7/module
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 11:52:11.123867000 +0100
++++ owfs-2.7p7/module/owftpd/src/Makefile.in 2008-11-01 12:29:12.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2721,9 +3524,36 @@ diff -ur owfs-2.7p7-orig/module/owftpd/src/Makefile.in owfs-2.7p7/module/owftpd/
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 11:52:11.307867061 +0100
++++ owfs-2.7p7/module/owhttpd/Makefile.in 2008-11-01 12:29:12.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2740,9 +3570,36 @@ diff -ur owfs-2.7p7-orig/module/owhttpd/Makefile.in owfs-2.7p7/module/owhttpd/Ma
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 11:52:11.431867039 +0100
++++ 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@
@@ -2759,9 +3616,36 @@ diff -ur owfs-2.7p7-orig/module/owhttpd/src/c/Makefile.in owfs-2.7p7/module/owht
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 11:52:11.487866963 +0100
++++ 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@
@@ -2778,9 +3662,36 @@ diff -ur owfs-2.7p7-orig/module/owhttpd/src/include/Makefile.in owfs-2.7p7/modul
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 11:52:11.363866637 +0100
++++ owfs-2.7p7/module/owhttpd/src/Makefile.in 2008-11-01 12:29:12.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2797,9 +3708,36 @@ diff -ur owfs-2.7p7-orig/module/owhttpd/src/Makefile.in owfs-2.7p7/module/owhttp
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 11:52:11.543866539 +0100
++++ owfs-2.7p7/module/owlib/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2816,9 +3754,36 @@ diff -ur owfs-2.7p7-orig/module/owlib/Makefile.in owfs-2.7p7/module/owlib/Makefi
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 11:52:11.687866544 +0100
++++ 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@
@@ -2835,9 +3800,36 @@ diff -ur owfs-2.7p7-orig/module/owlib/src/c/Makefile.in owfs-2.7p7/module/owlib/
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 11:52:11.747866628 +0100
++++ 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@
@@ -2854,9 +3846,36 @@ diff -ur owfs-2.7p7-orig/module/owlib/src/include/Makefile.in owfs-2.7p7/module/
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 11:52:11.599866603 +0100
++++ owfs-2.7p7/module/owlib/src/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2873,9 +3892,36 @@ diff -ur owfs-2.7p7-orig/module/owlib/src/Makefile.in owfs-2.7p7/module/owlib/sr
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 11:52:11.799866952 +0100
++++ owfs-2.7p7/module/owmon/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -76,6 +76,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2892,9 +3938,36 @@ diff -ur owfs-2.7p7-orig/module/owmon/Makefile.in owfs-2.7p7/module/owmon/Makefi
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 11:52:11.915866612 +0100
++++ owfs-2.7p7/module/ownet/c/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2911,9 +3984,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/c/Makefile.in owfs-2.7p7/module/ownet/c/Ma
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 11:52:12.043867028 +0100
++++ 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@
@@ -2930,9 +4030,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/c/src/c/Makefile.in owfs-2.7p7/module/owne
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 11:52:12.103866972 +0100
++++ 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@
@@ -2949,9 +4076,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/c/src/include/Makefile.in owfs-2.7p7/modul
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 11:52:11.975867114 +0100
++++ 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@
@@ -2968,9 +4122,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/c/src/Makefile.in owfs-2.7p7/module/ownet/
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 11:52:11.859866547 +0100
++++ owfs-2.7p7/module/ownet/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2987,9 +4168,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/Makefile.in owfs-2.7p7/module/ownet/Makefi
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 11:52:12.155866598 +0100
++++ owfs-2.7p7/module/ownet/perl5/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -74,6 +74,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3006,9 +4214,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/perl5/Makefile.in owfs-2.7p7/module/ownet/
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 11:52:12.211866942 +0100
++++ owfs-2.7p7/module/ownet/php/Makefile.in 2008-11-01 12:29:13.000000000 +0100
@@ -74,6 +74,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3025,9 +4260,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/php/Makefile.in owfs-2.7p7/module/ownet/ph
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 11:52:12.267866587 +0100
++++ owfs-2.7p7/module/ownet/python/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -74,6 +74,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3044,9 +4306,36 @@ diff -ur owfs-2.7p7-orig/module/ownet/python/Makefile.in owfs-2.7p7/module/ownet
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 11:52:12.323866581 +0100
++++ owfs-2.7p7/module/owserver/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3063,9 +4352,36 @@ diff -ur owfs-2.7p7-orig/module/owserver/Makefile.in owfs-2.7p7/module/owserver/
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 11:52:12.447866558 +0100
++++ 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@
@@ -3082,9 +4398,36 @@ diff -ur owfs-2.7p7-orig/module/owserver/src/c/Makefile.in owfs-2.7p7/module/ows
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 11:52:12.503866622 +0100
++++ 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@
@@ -3101,9 +4444,36 @@ diff -ur owfs-2.7p7-orig/module/owserver/src/include/Makefile.in owfs-2.7p7/modu
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 11:52:12.379867064 +0100
++++ owfs-2.7p7/module/owserver/src/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3120,9 +4490,36 @@ diff -ur owfs-2.7p7-orig/module/owserver/src/Makefile.in owfs-2.7p7/module/owser
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 11:52:12.563866497 +0100
++++ owfs-2.7p7/module/owshell/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3139,9 +4536,36 @@ diff -ur owfs-2.7p7-orig/module/owshell/Makefile.in owfs-2.7p7/module/owshell/Ma
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 11:52:12.699866602 +0100
++++ 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@
@@ -3158,9 +4582,36 @@ diff -ur owfs-2.7p7-orig/module/owshell/src/c/Makefile.in owfs-2.7p7/module/owsh
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 11:52:12.755866666 +0100
++++ 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@
@@ -3177,9 +4628,36 @@ diff -ur owfs-2.7p7-orig/module/owshell/src/include/Makefile.in owfs-2.7p7/modul
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 11:52:12.619866490 +0100
++++ owfs-2.7p7/module/owshell/src/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3196,9 +4674,36 @@ diff -ur owfs-2.7p7-orig/module/owshell/src/Makefile.in owfs-2.7p7/module/owshel
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 11:52:12.811867219 +0100
++++ owfs-2.7p7/module/owside/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -76,6 +76,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3215,9 +4720,36 @@ diff -ur owfs-2.7p7-orig/module/owside/Makefile.in owfs-2.7p7/module/owside/Make
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 11:52:12.863866636 +0100
++++ owfs-2.7p7/module/owtap/Makefile.in 2008-11-01 12:29:14.000000000 +0100
@@ -76,6 +76,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3234,9 +4766,36 @@ diff -ur owfs-2.7p7-orig/module/owtap/Makefile.in owfs-2.7p7/module/owtap/Makefi
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 11:52:12.923866719 +0100
++++ owfs-2.7p7/module/swig/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -88,6 +88,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3253,9 +4812,36 @@ diff -ur owfs-2.7p7-orig/module/swig/Makefile.in owfs-2.7p7/module/swig/Makefile
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 11:52:12.979866644 +0100
++++ owfs-2.7p7/module/swig/perl5/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -74,6 +74,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3272,9 +4858,36 @@ diff -ur owfs-2.7p7-orig/module/swig/perl5/Makefile.in owfs-2.7p7/module/swig/pe
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 11:52:13.047867116 +0100
++++ owfs-2.7p7/module/swig/php/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -105,6 +105,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3291,9 +4904,36 @@ diff -ur owfs-2.7p7-orig/module/swig/php/Makefile.in owfs-2.7p7/module/swig/php/
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 11:52:13.107867061 +0100
++++ owfs-2.7p7/module/swig/python/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -91,6 +91,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3310,9 +4950,36 @@ diff -ur owfs-2.7p7-orig/module/swig/python/Makefile.in owfs-2.7p7/module/swig/p
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 11:52:13.159866966 +0100
++++ 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@
@@ -3329,9 +4996,36 @@ diff -ur owfs-2.7p7-orig/module/swig/python/ow/Makefile.in owfs-2.7p7/module/swi
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 11:52:13.235867058 +0100
++++ owfs-2.7p7/module/swig/tcl/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -110,6 +110,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3348,9 +5042,36 @@ diff -ur owfs-2.7p7-orig/module/swig/tcl/Makefile.in owfs-2.7p7/module/swig/tcl/
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 11:52:13.351866578 +0100
++++ owfs-2.7p7/src/include/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -88,6 +88,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3367,9 +5088,36 @@ diff -ur owfs-2.7p7-orig/src/include/Makefile.in owfs-2.7p7/src/include/Makefile
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 11:52:13.291866634 +0100
++++ owfs-2.7p7/src/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3386,9 +5134,36 @@ diff -ur owfs-2.7p7-orig/src/Makefile.in owfs-2.7p7/src/Makefile.in
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 11:52:13.411866592 +0100
++++ owfs-2.7p7/src/man/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -82,6 +82,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3405,9 +5180,36 @@ diff -ur owfs-2.7p7-orig/src/man/Makefile.in owfs-2.7p7/src/man/Makefile.in
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 11:52:13.467867075 +0100
++++ owfs-2.7p7/src/rpm/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -77,6 +77,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3424,9 +5226,36 @@ diff -ur owfs-2.7p7-orig/src/rpm/Makefile.in owfs-2.7p7/src/rpm/Makefile.in
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 11:52:13.523867000 +0100
++++ owfs-2.7p7/src/scripts/Makefile.in 2008-11-01 12:29:15.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3443,9 +5272,36 @@ diff -ur owfs-2.7p7-orig/src/scripts/Makefile.in owfs-2.7p7/src/scripts/Makefile
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 11:52:13.639866590 +0100
++++ 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@
@@ -3462,9 +5318,36 @@ diff -ur owfs-2.7p7-orig/src/scripts/usb/cygwin/Makefile.in owfs-2.7p7/src/scrip
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 11:52:13.579866855 +0100
++++ owfs-2.7p7/src/scripts/usb/Makefile.in 2008-11-01 12:29:16.000000000 +0100
@@ -86,6 +86,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3481,9 +5364,36 @@ diff -ur owfs-2.7p7-orig/src/scripts/usb/Makefile.in owfs-2.7p7/src/scripts/usb/
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 11:52:13.691866634 +0100
++++ 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@
@@ -3500,9 +5410,36 @@ diff -ur owfs-2.7p7-orig/src/scripts/usb/windows/Makefile.in owfs-2.7p7/src/scri
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 11:52:13.747867187 +0100
++++ owfs-2.7p7/src/scripts/windows/Makefile.in 2008-11-01 12:29:16.000000000 +0100
@@ -75,6 +75,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -3519,3 +5456,30 @@ diff -ur owfs-2.7p7-orig/src/scripts/windows/Makefile.in owfs-2.7p7/src/scripts/
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@
diff --git a/patches/owfs-2.7p7/generic/owfs-2.7p7-pkgconfigize-fuse.diff b/patches/owfs-2.7p7/generic/owfs-2.7p7-pkgconfigize-fuse.diff
new file mode 100644
index 000000000..d7c319483
--- /dev/null
+++ b/patches/owfs-2.7p7/generic/owfs-2.7p7-pkgconfigize-fuse.diff
@@ -0,0 +1,50 @@
+---
+ configure.ac | 28 +++++++++++++---------------
+ 1 file changed, 13 insertions(+), 15 deletions(-)
+
+Index: owfs-2.7p7/configure.ac
+===================================================================
+--- owfs-2.7p7.orig/configure.ac
++++ owfs-2.7p7/configure.ac
+@@ -936,18 +936,16 @@ AC_SUBST(LD_EXTRALIBS)
+ AC_SUBST(OSLIBS)
+ AC_MSG_WARN([LD_EXTRALIBS=${LD_EXTRALIBS} OSLIBS=${OSLIBS}])
+
+-AC_ARG_WITH(fuseinclude,
+- [ --with-fuseinclude=DIR FUSE-include from @<:@/usr/local/include@:>@],
+- [fuse_include_path=$withval],
+- [fuse_include_path='/usr/local/include'])
+-AC_SUBST(fuse_include_path)
+-
+-AC_ARG_WITH(fuselib,
+- [ --with-fuselib=DIR FUSE-lib from @<:@/usr/local/lib@:>@],
+- [fuse_lib_path=$withval],
+- [fuse_lib_path='/usr/local/lib'])
+-AC_SUBST(fuse_lib_path)
+-
++# check for fuse
++REQUIRES_FUSE="fuse >= 2.2.0"
++AC_SUBST(REQUIRES_FUSE)
++PKG_CHECK_MODULES([fuse],
++ [${REQUIRES_FUSE}],
++ [],
++ [AC_MSG_RESULT([*** ${REQUIRES_FUSE} not found by pkg-config on your system])]
++)
++AC_SUBST(fuse_CFLAGS)
++AC_SUBST(fuse_LIBS)
+
+ #Check owfs
+ AC_MSG_CHECKING([if owfs is enabled])
+@@ -974,9 +972,9 @@ if test "${ENABLE_OWFS}" != "false" ; th
+ 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"
+
diff --git a/patches/owfs-2.7p7/generic/series b/patches/owfs-2.7p7/generic/series
index 1095cc700..13248e2e7 100644
--- a/patches/owfs-2.7p7/generic/series
+++ b/patches/owfs-2.7p7/generic/series
@@ -1,2 +1,3 @@
owfs-2.7p7-disable-offtpd.diff
+owfs-2.7p7-pkgconfigize-fuse.diff
owfs-2.7p7-autogen.diff
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 12:38:40 +0000