diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2009-04-15 12:38:40 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-04-15 12:38:40 -0400 |
| commit | c51d826a201095fb3a7c68c3666e2b795a2b687d (patch) | |
| tree | cfcc6adfa27fe70409c5f3f0270e35ed5aada0be | |
| parent | b09228c86d4049b11c6ddf9284a637a211993b44 (diff) | |
| download | nfs-utils-c51d826a201095fb3a7c68c3666e2b795a2b687d.tar.gz nfs-utils-c51d826a201095fb3a7c68c3666e2b795a2b687d.tar.xz nfs-utils-c51d826a201095fb3a7c68c3666e2b795a2b687d.zip | |
nfs-utils: reverse order of librpcsecgss and libgssglue checks
The check that validates the version of librpcsecgss also needs to
have libgssglue installed. Without libgssglue, ./configure complains
that it can't find rpcsecgss, even though it's installed.
It also turns out that the error message generated by pkg-config is
more complete than the one we have in aclocal/rpcsec_vers.m4, so just
let those PKG_CHECK_MODULES m4 macros use the default error message.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | aclocal/rpcsec_vers.m4 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4 index e59c0aa..25902ca 100644 --- a/aclocal/rpcsec_vers.m4 +++ b/aclocal/rpcsec_vers.m4 @@ -1,12 +1,11 @@ dnl Checks librpcsec version AC_DEFUN([AC_RPCSEC_VERSION], [ - dnl TI-RPC replaces librpcsecgss, but we still need libgssglue + PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1]) + + dnl TI-RPC replaces librpcsecgss if test "$enable_tirpc" = no; then - PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16], , - [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss. If you have pkgconfig installed, you might try setting environment variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])]) - else - PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1]) + PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16]) fi ])dnl |