aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>1998-03-29 10:26:20 +0000
committerH. Peter Anvin <hpa@zytor.com>1998-03-29 10:26:20 +0000
commite1dbb9fe60aa8bf48b07ce2896838f76cc98e226 (patch)
tree87f278ba5cb3d2738aa2061a17a01a18474dfe7e /include
parent43d9d88fd0160c7beecba8b78227cc7247e8d6e9 (diff)
downloadautofs3-e1dbb9fe60aa8bf48b07ce2896838f76cc98e226.tar.gz
autofs3-e1dbb9fe60aa8bf48b07ce2896838f76cc98e226.tar.xz
autofs3-e1dbb9fe60aa8bf48b07ce2896838f76cc98e226.zip
Make autofs self-configuring (using autoconf)
Diffstat (limited to 'include')
-rw-r--r--include/automount.h23
-rw-r--r--include/config.h.in19
2 files changed, 25 insertions, 17 deletions
diff --git a/include/automount.h b/include/automount.h
index 14f13c5..d3899ef 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -10,26 +10,15 @@
#define AUTOMOUNT_H
#include <paths.h>
+#include "config.h"
-#ifndef _PATH_MOUNT
-#define _PATH_MOUNT "/bin/mount"
+/* We MUST have the paths to mount(8) and umount(8) */
+#ifndef HAVE_MOUNT
+#error Failed to locate mount(8)!
#endif
-#ifndef _PATH_UMOUNT
-#define _PATH_UMOUNT "/bin/umount"
-#endif
-#ifndef _PATH_AUTOMOUNT
-#define _PATH_AUTOMOUNT "/usr/sbin/automount"
-#endif
-
-#ifndef _PATH_E2FSCK
-#define _PATH_E2FSCK "/sbin/fsck.ext2"
-#endif
-
-/* If smbmount is unavailable, remove the mount_smbfs module from
- modules/Makefile */
-#ifndef _PATH_SMBMOUNT
-#define _PATH_SMBMOUNT "/usr/bin/smbmount"
+#ifndef HAVE_UMOUNT
+#error Failed to locate umount(8)!
#endif
/* Standard function used by daemon or modules */
diff --git a/include/config.h.in b/include/config.h.in
new file mode 100644
index 0000000..70ce165
--- /dev/null
+++ b/include/config.h.in
@@ -0,0 +1,19 @@
+/* -*- c -*-
+ *
+ * config.h.in: Pattern file for autofs to be filled in by configure
+ *
+ */
+
+/* Program paths */
+#undef HAVE_MOUNT
+#undef PATH_MOUNT
+
+#undef HAVE_UMOUNT
+#undef PATH_UMOUNT
+
+#undef HAVE_SMBMOUNT
+#undef PATH_SMBMOUNT
+
+#undef HAVE_E2FSCK
+#undef PATH_E2FSCK
+