Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001 |
| 2 | From: "Roy.Li" <rongqing.li@windriver.com> |
| 3 | Date: Tue, 25 Jun 2013 09:22:59 +0800 |
| 4 | Subject: [PATCH] Avoid to call AC_TRY_RUN |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | |
| 8 | Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO |
| 9 | on cross-compile environment by definition AC_ARG_ENABLE enable-spnego |
| 10 | |
| 11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 12 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 13 | --- |
| 14 | m4/sasl2.m4 | 15 +++++++++++++-- |
| 15 | 1 file changed, 13 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 |
| 18 | index 56e0504..cf62607 100644 |
| 19 | --- a/m4/sasl2.m4 |
| 20 | +++ b/m4/sasl2.m4 |
| 21 | @@ -314,7 +314,18 @@ if test "$gssapi" != no; then |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | cmu_save_LIBS="$LIBS" |
| 23 | LIBS="$LIBS $GSSAPIBASE_LIBS" |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 24 | |
| 25 | - AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 26 | + AC_ARG_ENABLE([spnego], |
| 27 | + [AC_HELP_STRING([--enable-spnego=<DIR>], |
| 28 | + [enable SPNEGO support in GSSAPI libraries [no]])], |
| 29 | + [spnego=$enableval], |
| 30 | + [spnego=no]) |
| 31 | + |
| 32 | + if test "$spnego" = no; then |
| 33 | + echo "no" |
| 34 | + elif test "$spnego" = yes; then |
| 35 | + AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) |
| 36 | + else |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 37 | + AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 38 | AC_TRY_RUN([ |
| 39 | #ifdef HAVE_GSSAPI_H |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 40 | #include <gssapi.h> |
| 41 | @@ -341,7 +352,7 @@ int main(void) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 42 | AC_MSG_RESULT(yes) ], |
| 43 | AC_MSG_RESULT(no)) |
| 44 | LIBS="$cmu_save_LIBS" |
| 45 | - |
| 46 | + fi |
| 47 | else |
| 48 | AC_MSG_RESULT([disabled]) |
| 49 | fi |