Two changes in this ball...

1) Changes to smbmnt.c, smbmount.c, and smbumount.c allow them to compile on
both RedHat 4.x (libc 4.x) systems and RedHat 5.x (glibc 2) systems.

2) Changes to Makefile.in and configure.in (and subsequently configure) are to
configure for smbmount, smbumount, and smbmnt to compile.

This adds a "--with(out)-smbmount" option to configure.  Sanity checking is
not present yet.  You can specify this if you are not on linux, it just
won't compile.

1 files changed, 12 insertions, 22 deletions

diff --git a/source/client/smbmnt.c b/source/client/smbmnt.c
index f6753090b8a..fa3cacb8640 100644
--- a/source/client/smbmnt.c
+++ b/source/client/smbmnt.c
@@ -5,34 +5,24 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/socket.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-/* #include <sys/wait.h> */  /* generates a warning here */
-extern pid_t waitpid(pid_t, int *, int);
-#include <sys/errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/mount.h>
+#include "includes.h"
+
 #include <mntent.h>
 
-#include <linux/fs.h>
+#include <asm/types.h>
+#include <asm/posix_types.h>
 #include <linux/smb.h>
 #include <linux/smb_mount.h>
-
 #include <asm/unistd.h>
 
+#ifndef	MS_MGC_VAL
+/* This may look strange but MS_MGC_VAL is what we are looking for and
+	is what we need from <linux/fs.h> under libc systems and is
+	provided in standard includes on glibc systems.  So...  We
+	switch on what we need...  */
+#include <linux/fs.h>
+#endif
+
 static char *progname;