examples/VFS: fix the configure and make with the new directory layout

metze

diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in
index 4de0efd29e856ba5489ba6450033ce3ec793cb24..8fe414a9e8c6e00bfb19ad67ec90d2e527160300 100644 (file)
--- a/examples/VFS/Makefile.in
+++ b/examples/VFS/Makefile.in
@@ -9,12 +9,14 @@ SHLIBEXT      = @SHLIBEXT@
 OBJEXT         = @OBJEXT@ 
 FLAGS          =  $(CFLAGS) $(CPPFLAGS) -fPIC \
                -Iinclude -I$(SAMBA_SOURCE)/include \
-               -I$(SAMBA_SOURCE)/popt  \
-               -I$(SAMBA_SOURCE)/lib/replace  \
-               -I$(SAMBA_SOURCE)/lib/talloc  \
-               -I$(SAMBA_SOURCE)/lib/tdb/include  \
-               -I$(SAMBA_SOURCE)/smbwrapper \
+               -I$(SAMBA_SOURCE)/../popt  \
+               -I$(SAMBA_SOURCE)/../lib/replace  \
+               -I$(SAMBA_SOURCE)/../lib/talloc  \
+               -I$(SAMBA_SOURCE)/../lib/tevent  \
+               -I$(SAMBA_SOURCE)/../lib/tdb/include  \
                -I$(SAMBA_SOURCE)/librpc \
+               -I$(SAMBA_SOURCE)/../librpc \
+               -I$(SAMBA_SOURCE)/../ \
                -I$(SAMBA_SOURCE) -I.
 
 

diff --git a/examples/VFS/configure.in b/examples/VFS/configure.in
index b8e10d482b820773c6f1e277cf173f632997d9b0..4e9d46544dbc6be7036cb8be87be65867a2b95ac 100644 (file)
--- a/examples/VFS/configure.in
+++ b/examples/VFS/configure.in
@@ -27,11 +27,11 @@ AC_ARG_WITH(fhs,
 
 AC_SUBST(libdir)
 
-SAMBA_SOURCE="../../source"
+SAMBA_SOURCE="../../source3"
 ####################################################
 # set the location location of the samba source tree
 AC_ARG_WITH(samba-source,
-[  --with-samba-source=DIR Where is the samba source tree (../../source)],
+[  --with-samba-source=DIR Where is the samba source tree (../../source3)],
 [ case "$withval" in
   yes|no)
   #
@@ -337,11 +337,11 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
    ac_cv_shlib_works=no
    # try building a trivial shared library
    if test "$PICSUFFIX" = "po"; then
-     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/../../source/tests/shlib.c &&
+     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/../../tests/shlib.c &&
        $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
        ac_cv_shlib_works=yes
    else
-     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${srcdir-.}/tests/shlib.c &&
+     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${srcdir-.}/../../tests/shlib.c &&
        mv shlib.$PICSUFFIX shlib.po &&
        $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
        ac_cv_shlib_works=yes

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 48b497922a594fa6e41d96c7d96e2c070adb59a4..2eb7a9477634729ad266037ffd77496d43928e24 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -52,9 +52,9 @@ static void skel_disconnect(vfs_handle_struct *handle, connection_struct *conn)
        return;
 }
 
-static SMB_BIG_UINT skel_disk_free(vfs_handle_struct *handle,  const char *path,
-       bool small_query, SMB_BIG_UINT *bsize,
-       SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
+static uint64_t skel_disk_free(vfs_handle_struct *handle,  const char *path,
+       bool small_query, uint64_t *bsize,
+       uint64_t *dfree, uint64_t *dsize)
 {
        return vfswrap_disk_free(NULL,  path, small_query, bsize, 
                                         dfree, dsize);

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index f5562a5f444d9dabb01a9b8f0a615c8ff45f4c44..5670965417277617b7c4cf0a8ee416750365b2e5 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -46,9 +46,9 @@ static void skel_disconnect(vfs_handle_struct *handle)
        SMB_VFS_NEXT_DISCONNECT(handle);
 }
 
-static SMB_BIG_UINT skel_disk_free(vfs_handle_struct *handle,  const char *path,
-       bool small_query, SMB_BIG_UINT *bsize,
-       SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
+static uint64_t skel_disk_free(vfs_handle_struct *handle,  const char *path,
+       bool small_query, uint64_t *bsize,
+       uint64_t *dfree, uint64_t *dsize)
 {
        return SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize, 
                                         dfree, dsize);