From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Mon, 25 Apr 2022 19:45:47 +0000 (+0300)
Subject: m4: want_gssapi.m4 - Modernize m4 syntax
X-Git-Tag: 2.4.0~3878
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b5e120a30cf221ccbb0d28eac6d41a98fe4cfb;p=thirdparty%2Fdovecot%2Fcore.git

m4: want_gssapi.m4 - Modernize m4 syntax
---

diff --git a/m4/want_gssapi.m4 b/m4/want_gssapi.m4
index 7866aba0de..483b730ef5 100644
--- a/m4/want_gssapi.m4
+++ b/m4/want_gssapi.m4
@@ -1,11 +1,11 @@
 AC_DEFUN([DOVECOT_WANT_GSSAPI], [
   have_gssapi=no
-  if test $want_gssapi != no; then
-  	AC_CHECK_PROG(KRB5CONFIG, krb5-config, krb5-config, NO)
-  	if test $KRB5CONFIG != NO; then
+  AS_IF([test $want_gssapi != no], [
+  	AC_CHECK_PROG(KRB5CONFIG, krb5-config, krb5-config, missing)
+  	AS_IF([test $KRB5CONFIG != missing], [
   		KRB5_LIBS="`$KRB5CONFIG --libs`"
   		KRB5_CFLAGS=`$KRB5CONFIG --cflags`
-  		if ! $KRB5CONFIG --version gssapi 2>/dev/null > /dev/null; then
+  		AS_IF([! $KRB5CONFIG --version gssapi 2>/dev/null >/dev/null], [
   		  # krb5-config doesn't support gssapi.
   		  AC_CHECK_LIB(gss, gss_acquire_cred, [
   		    # Solaris
@@ -14,11 +14,11 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
   		    # failed
   		    KRB5_LIBS=
   		  ], $KRB5_LIBS)
-  		else
+  		], [
   		  KRB5_LIBS="$KRB5_LIBS `$KRB5CONFIG --libs gssapi`"
   		  KRB5_CFLAGS="$KRB5_CFLAGS `$KRB5CONFIG --cflags gssapi`"
-  		fi
-  		if test "$KRB5_LIBS" != ""; then
+  		])
+  		AS_IF([test "$KRB5_LIBS" != ""], [
   			AC_SUBST(KRB5_LIBS)
   			AC_SUBST(KRB5_CFLAGS)
   			
@@ -34,10 +34,10 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
   				AC_DEFINE(HAVE_GSSAPI_H,, [GSSAPI headers in gssapi.h])
   				have_gssapi=yes
   			])
-  			if test $have_gssapi != no; then
-  				if test $want_gssapi = plugin; then
+  			AS_IF([test $have_gssapi != no], [
+  				AS_IF([test $want_gssapi = plugin], [
   					have_gssapi=plugin
-  				fi
+  				])
   				AC_DEFINE(HAVE_GSSAPI,, [Build with GSSAPI support])
   				AC_CHECK_HEADERS(gssapi/gssapi_ext.h gssapi_krb5.h gssapi/gssapi_krb5.h)
   				AC_CHECK_LIB(gss, __gss_userok, [
@@ -55,7 +55,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
   
   				# does the kerberos library support SPNEGO?
   				AC_CACHE_CHECK([whether GSSAPI supports SPNEGO],i_cv_gssapi_spnego,[
-  				  AC_TRY_RUN([
+  				  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
   				    #ifdef HAVE_GSSAPI_H
   				    #  include <gssapi.h>
   				    #else
@@ -63,7 +63,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
   				    #endif
   				    #include <krb5.h>
   				    #include <string.h>
-  				    int main(void) {
+  				    ]], [[
   				      OM_uint32 minor_status;
   				      gss_OID_set mech_set;
   				      unsigned char spnego_oid[] = { 0x2b, 0x06, 0x01, 0x05, 0x05, 0x02 };
@@ -77,37 +77,36 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
   					      return 0;
   				      }
   				      return 1;
-  				    }
-  				  ], [
+  				  ]])],[
   				    i_cv_gssapi_spnego=yes
   				  ], [
   				    i_cv_gssapi_spnego=no
-  				  ])
+  				  ],[])
   				])
-  				if test "$i_cv_gssapi_spnego" = "yes"; then
+  				AS_IF([test "$i_cv_gssapi_spnego" = "yes"], [
   				  AC_DEFINE(HAVE_GSSAPI_SPNEGO,, [GSSAPI supports SPNEGO])
-  				fi
+  				])
   				LIBS=$old_LIBS
   
-  				if test $want_gssapi != plugin; then
+  				AS_IF([test $want_gssapi != plugin], [
   				  AUTH_LIBS="$AUTH_LIBS $KRB5_LIBS"
   				  AUTH_CFLAGS="$AUTH_CFLAGS $KRB5_CFLAGS"
   				  AC_DEFINE(BUILTIN_GSSAPI,, [GSSAPI support is built in])
-  				else
+  				], [
   				  have_gssapi_plugin=yes
-  				fi
-  			else
-  			  if test $want_gssapi != auto; then
+  				])
+  			], [
+  			  AS_IF([test $want_gssapi != auto], [
   			    AC_ERROR([Can't build with GSSAPI support: gssapi.h not found])
-  			  fi
-  			fi
+  			  ])
+  			])
   			CFLAGS=$old_CFLAGS
-  		fi
-  	else
-  	  if test $want_gssapi != auto; then
+  		])
+  	], [
+  	  AS_IF([test $want_gssapi != auto], [
   	    AC_ERROR([Can't build with GSSAPI support: krb5-config not found])
-  	  fi
-  	fi
-  fi
+  	  ])
+  	])
+  ])
   AM_CONDITIONAL(GSSAPI_PLUGIN, test "$have_gssapi_plugin" = "yes")
 ])