summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-05 17:27:53 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-05 17:28:48 +0100
commit71d2287ec7740cf2089ddbef6991e7c3a80dcae0 (patch)
tree2ae34ca5a92a6c9a20d737fcd4b43a9cb34ce143 /examples
parentf289851d70ea7a8f66a31e9af7d9fc6e16ebffef (diff)
downloadsamba-71d2287ec7740cf2089ddbef6991e7c3a80dcae0.tar.gz
samba-71d2287ec7740cf2089ddbef6991e7c3a80dcae0.tar.xz
samba-71d2287ec7740cf2089ddbef6991e7c3a80dcae0.zip
examples/VFS: fix the configure and make with the new directory layout
metze
Diffstat (limited to 'examples')
-rw-r--r--examples/VFS/Makefile.in12
-rw-r--r--examples/VFS/configure.in8
-rw-r--r--examples/VFS/skel_opaque.c6
-rw-r--r--examples/VFS/skel_transparent.c6
4 files changed, 17 insertions, 15 deletions
diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in
index 4de0efd29e8..8fe414a9e8c 100644
--- 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 b8e10d482b8..4e9d46544db 100644
--- 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 48b497922a5..2eb7a947763 100644
--- 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 f5562a5f444..56709654172 100644
--- 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);