1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-volume-manager/configure.in,v
retrieving revision 1.94
diff -u -b -B -r1.94 configure.in
--- configure.in 3 Aug 2005 17:52:49 -0000 1.94
+++ configure.in 8 Aug 2005 18:10:06 -0000
@@ -8,14 +8,28 @@
AC_PROG_CC
AC_PATH_PROG(mount_path, mount, mount)
+AC_PATH_PROG(pmount_hal_path, pmount-hal, NOTFOUND)
AC_PATH_PROG(umount_path, umount, umount)
+AC_PATH_PROG(pumount_path, pumount, NOTFOUND)
+
+if test ! x$pmount_hal_path = xNOTFOUND; then
+ mount_path="${pmount_hal_path} %h"
+else
+ mount_path="${mount_path} %d"
+fi
+
+if test ! x$pumount_path = xNOTFOUND; then
+ umount_path="${pumount_path} %d"
+else
+ umount_path="${umount_path} %d"
+fi
AC_ARG_WITH(mount-command, AC_HELP_STRING(--with-mount-command], [Command to invoke in order to mount a device]),
- mount_command="$withval", mount_command="${mount_path} %d")
+ mount_command="$withval", mount_command="${mount_path}")
AC_DEFINE_UNQUOTED([MOUNT_COMMAND], ["${mount_command}"], [mount command])
AC_ARG_WITH(unmount-command, AC_HELP_STRING(--with-unmount-command], [Command to invoke in order to unmount a device]),
- unmount_command="$withval", unmount_command="${umount_path} %d")
+ unmount_command="$withval", unmount_command="${umount_path}")
AC_DEFINE_UNQUOTED([UNMOUNT_COMMAND], ["${unmount_command}"], [unmount command])
AC_PATH_PROG(nautilus_path, nautilus, nautilus)
Index: src/manager.c
===================================================================
RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
retrieving revision 1.72
diff -u -b -B -r1.72 manager.c
|
GitWeb
