Recently #include directives for autoconf's config.h file were added in

utils/mount/error.c and utils/mount/mount.c, but appropriate HAVE_CONFIG_H
checks were not added at the same time.

In addition, several other .c files under utils/mount reference
autoconf-generated HAVE_ macros, but don't appear to include config.h

Also, Heinz-Ado Arnolds <arnolds@MPA-Garching.MPG.DE> reports that this
patch is needed to ensure START_STATD is properly defined in
utils/mount/network.c.  Otherwise start_statd() is always a no-op, even if
the configure script defines an appropriate statd start-up script.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Heinz-Ado Arnolds <arnolds@MPA-Garching.MPG.DE>
Signed-off-by: Steve Dickson <steved@dickson.boston.devel.redhat.com>

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 10d4ed28e187ee9c224b3432ce600163a9543ed0..23a91ff792d719e38b22a46730009e49c303b28d 100644 (file)
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -23,7 +23,10 @@
  *  + Proper support for internationalization
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 839a3296214ac654aa5738bc33f004ba5003dc31..5076468db8cc29384d22c2a99225934643709be0 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -18,7 +18,10 @@
  *
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 38d0135b799000ea7c70814fe6f57a0a86783220..ab7f6d01072b73ae918fcada746bf50583f69f28 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <unistd.h>
 #include <stdio.h>

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 0a32c3c4f644444e135ebb2405b6130077960fc3..311e5a07b0b04c6ac4c42ed84fb47e0ab7f29161 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -18,6 +18,10 @@
  * - Moved to nfs-utils/utils/mount from util-linux/mount.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index f2e0e009658ab8ac90a990a376862570d7c6edb0..d1d43c661e41555eb7ea6aa0448f69e5c8ffefb4 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -35,6 +35,10 @@
  * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <unistd.h>
 #include <stdio.h>

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 0c8d3e1baf83779b9447893d3d796bf3b7bfd0f2..cadb1f473e4b4383eedbd58060648f9cf7b560d3 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <unistd.h>
 #include <stdio.h>