gnomevfs/captive.conf is now configure-substituted for fs modules paths

diff --git a/autogen.pl b/autogen.pl
index 503b2ec..8450a26 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -38,6 +38,7 @@ AutoGen->run(
                                ./doc/*-pod.*
                                ./doc/apiref/captive.types
                                ./src/client/cmdline/captivecmdline
+                               ./src/client/libcaptive-gnomevfs/captive.conf
                                ./src/libcaptive/ke/exports.c
                                ./src/libcaptive/reactos/*/*.c
                                ./src/libcaptive/sandbox/sandbox-common.c

diff --git a/src/client/libcaptive-gnomevfs/captive.conf b/src/client/libcaptive-gnomevfs/captive.conf
deleted file mode 100644 (file)
index d7c2ab6..0000000
--- a/src/client/libcaptive-gnomevfs/captive.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-captive-fs.so:  libcaptive-gnomevfs.so --load-module=/home/lace/src/captive/w32/ntoskrnl.exe --filesystem=/home/lace/.captive-fs.so  --rw --debug-messages
-captive-fs.sys: libcaptive-gnomevfs.so --load-module=/home/lace/src/captive/w32/ntoskrnl.exe --filesystem=/home/lace/.captive-fs.sys --rw --debug-messages

diff --git a/src/client/libcaptive-gnomevfs/captive.conf.in b/src/client/libcaptive-gnomevfs/captive.conf.in
new file mode 100644 (file)
index 0000000..f65474b
--- /dev/null
+++ b/src/client/libcaptive-gnomevfs/captive.conf.in
@@ -0,0 +1,11 @@
+captive-cdfs: libcaptive-gnomevfs.so \
+               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive-ntoskrnl.exe \
+                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive-cdfs.sys --ro
+
+captive-fastfat: libcaptive-gnomevfs.so \
+               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive-ntoskrnl.exe \
+                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive-fastfat.sys --rw
+
+captive-ext2fsd: libcaptive-gnomevfs.so \
+               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive-ntoskrnl.exe \
+                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive-ext2fsd.sys --rw