diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-03-11 13:11:50 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@dickson.boston.devel.redhat.com> | 2008-03-11 13:11:50 -0400 |
| commit | ab26cd622e1a5ef22be2df1f3176158b1505df30 (patch) | |
| tree | ee919fbd34a3e12763daf49be164db7c8c008a71 | |
| parent | 9c1e19f1c6ba13e08c51c21db6f21ef1e203b37c (diff) | |
| download | nfs-utils-ab26cd622e1a5ef22be2df1f3176158b1505df30.tar.gz nfs-utils-ab26cd622e1a5ef22be2df1f3176158b1505df30.tar.xz nfs-utils-ab26cd622e1a5ef22be2df1f3176158b1505df30.zip | |
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>
| -rw-r--r-- | utils/mount/error.c | 5 | ||||
| -rw-r--r-- | utils/mount/mount.c | 5 | ||||
| -rw-r--r-- | utils/mount/network.c | 4 | ||||
| -rw-r--r-- | utils/mount/nfs4mount.c | 4 | ||||
| -rw-r--r-- | utils/mount/nfsmount.c | 4 | ||||
| -rw-r--r-- | utils/mount/stropts.c | 4 |
6 files changed, 24 insertions, 2 deletions
diff --git a/utils/mount/error.c b/utils/mount/error.c index 10d4ed2..23a91ff 100644 --- 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 839a329..5076468 100644 --- 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 38d0135..ab7f6d0 100644 --- 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 0a32c3c..311e5a0 100644 --- 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 f2e0e00..d1d43c6 100644 --- 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 0c8d3e1..cadb1f4 100644 --- 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> |