Browse Source

* Makefile.am (AM_CFLAGS): Add -DCONFIGDIR=\""@configdir@"\"
if smbfs support is enabled.

* smbfs.c (smbfs_init): Use CONFIGDIR for smb.conf.

Andrew V. Samoilov 23 years ago
parent
commit
d8bec56efe
3 changed files with 13 additions and 2 deletions
  1. 8 1
      vfs/ChangeLog
  2. 4 0
      vfs/Makefile.am
  3. 1 1
      vfs/smbfs.c

+ 8 - 1
vfs/ChangeLog

@@ -1,4 +1,11 @@
-2001-01-02  Pavel Roskin  <proski@gnu.org>
+2002-01-11  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* Makefile.am (AM_CFLAGS): Add -DCONFIGDIR=\""@configdir@"\"
+	if smbfs support is enabled.
+
+	* smbfs.c (smbfs_init): Use CONFIGDIR for smb.conf.
+
+2002-01-02  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.am: Add *clean-local targets to take care of the
 	samba directory.

+ 4 - 0
vfs/Makefile.am

@@ -1,6 +1,10 @@
 SUBDIRS = extfs
 
+if USE_SAMBA_FS
+AM_CFLAGS = $(GLIB_CFLAGS) -DCONFIGDIR=\""@configdir@"\"
+else
 AM_CFLAGS = $(GLIB_CFLAGS)
+endif
 
 BASICFILES = 			\
 	cpio.c			\

+ 1 - 1
vfs/smbfs.c

@@ -250,7 +250,7 @@ smbfs_set_debug(int arg)
 static int
 smbfs_init(vfs *me)
 {
-	char *servicesf = "/etc/smb.conf";
+	char *servicesf = CONFIGDIR "/smb.conf";
 
 /*	DEBUGLEVEL = 4;	*/