diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 01e6c3141..58a93530c 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,9 @@ +2003-10-29 Pavel Roskin + + * Makefile.am: Compile utilvfs.c even without USE_VFS_NET. + * utilvfs.c (vfs_split_url): Only compile with USE_NETCODE + defined. + 2003-10-28 Pavel Roskin * fish.c (fish_fh_open): Use vfs_mkstemps() for write buffers as diff --git a/vfs/Makefile.am b/vfs/Makefile.am index 988c237ed..a6eb6e519 100644 --- a/vfs/Makefile.am +++ b/vfs/Makefile.am @@ -19,6 +19,7 @@ BASICFILES = \ local.c \ tar.c \ sfs.c \ + utilvfs.c \ vfs.c VFSHDRS = \ @@ -43,8 +44,7 @@ if USE_UNDEL_FS UNDEL_FILES = $(UNDELFILES) endif -NETFILES = tcputil.c fish.c ftpfs.c mcfs.c mcfsutil.c utilvfs.c \ - $(SMB_NETFILES) +NETFILES = tcputil.c fish.c ftpfs.c mcfs.c mcfsutil.c $(SMB_NETFILES) NONETFILES = $(BASICFILES) $(UNDEL_FILES) diff --git a/vfs/utilvfs.c b/vfs/utilvfs.c index 17ee9b22b..346af0cc6 100644 --- a/vfs/utilvfs.c +++ b/vfs/utilvfs.c @@ -40,6 +40,7 @@ * host. */ +#ifdef USE_NETCODE char * vfs_split_url (const char *path, char **host, char **user, int *port, char **pass, int default_port, int flags) @@ -128,6 +129,7 @@ vfs_split_url (const char *path, char **host, char **user, int *port, g_free (pcopy); return retval; } +#endif /* USE_NETCODE */ /* * Look up a user or group name from a uid/gid, maintaining a cache.