No longer break out of a shell "for" statement from inside

AC_FOO_IFELSE macros, otherwise temp files are not removed.

Identation adjustment.

acinclude.m4

@@ -251,6 +251,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
       for arg1 in 'int' 'SOCKET'; do
         for arg2 in "struct sockaddr" void; do
           for t in int size_t unsigned long "unsigned long"; do
+            if test "$curl_cv_socklen_t_equiv" = "unknown"; then
               AC_COMPILE_IFELSE([
                 AC_LANG_PROGRAM([[
 #undef inline
@@ -283,8 +284,8 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
                 ]])
               ],[
                 curl_cv_socklen_t_equiv="$t"
-               break 3
               ])
+            fi
           done
         done
       done
@@ -413,6 +414,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
         for gni_arg2 in 'socklen_t' 'size_t' 'int'; do
           for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do
             for gni_arg7 in 'int' 'unsigned int'; do
+              if test "$curl_cv_func_getnameinfo_args" = "unknown"; then
                 AC_COMPILE_IFELSE([
                   AC_LANG_PROGRAM([[
 #undef inline 
@@ -457,8 +459,8 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
                   ]])
                 ],[
                   curl_cv_func_getnameinfo_args="$gni_arg1,$gni_arg2,$gni_arg46,$gni_arg7"
-                 break 4
                 ])
+              fi
             done
           done
         done
@@ -718,6 +720,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
           for recv_arg2 in 'char *' 'void *'; do
             for recv_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
               for recv_arg4 in 'int' 'unsigned int'; do
+                if test "$curl_cv_func_recv_args" = "unknown"; then
                   AC_COMPILE_IFELSE([
                     AC_LANG_PROGRAM([[
 #undef inline 
@@ -743,7 +746,8 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
 #endif
 #define RECVCALLCONV
 #endif
-                    extern $recv_retv RECVCALLCONV recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
+                      extern $recv_retv RECVCALLCONV
+                      recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
                     ]],[[
                       $recv_arg1 s=0;
                       $recv_arg2 buf=0;
@@ -753,8 +757,8 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
                     ]])
                   ],[
                     curl_cv_func_recv_args="$recv_arg1,$recv_arg2,$recv_arg3,$recv_arg4,$recv_retv"
-                   break 5
                   ])
+                fi
               done
             done
           done
@@ -850,6 +854,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
           for send_arg2 in 'char *' 'void *' 'const char *' 'const void *'; do
             for send_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
               for send_arg4 in 'int' 'unsigned int'; do
+                if test "$curl_cv_func_send_args" = "unknown"; then
                   AC_COMPILE_IFELSE([
                     AC_LANG_PROGRAM([[
 #undef inline 
@@ -875,7 +880,8 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
 #endif
 #define SENDCALLCONV
 #endif
-                    extern $send_retv SENDCALLCONV send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
+                      extern $send_retv SENDCALLCONV
+                      send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
                     ]],[[
                       $send_arg1 s=0;
                       $send_arg3 len=0;
@@ -884,8 +890,8 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
                     ]])
                   ],[
                     curl_cv_func_send_args="$send_arg1,$send_arg2,$send_arg3,$send_arg4,$send_retv"
-                   break 5
                   ])
+                fi
               done
             done
           done
@@ -1258,14 +1264,15 @@ dnl TYPE_IN_ADDR_T
 dnl -------------------------------------------------
 dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
 dnl and a few other things.
-AC_DEFUN([TYPE_IN_ADDR_T],
+
-[
+AC_DEFUN([TYPE_IN_ADDR_T], [
   AC_CHECK_TYPE([in_addr_t], ,[
-      AC_MSG_CHECKING([for in_addr_t equivalent])
+    dnl in_addr_t not available
-      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
+    AC_CACHE_CHECK([for in_addr_t equivalent],
-      [
+      [curl_cv_in_addr_t_equiv], [
-         curl_cv_in_addr_t_equiv=
+      curl_cv_in_addr_t_equiv="unknown"
       for t in "unsigned long" int size_t unsigned long; do
+        if test "$curl_cv_in_addr_t_equiv" = "unknown"; then
           AC_LINK_IFELSE([
             AC_LANG_PROGRAM([[
 #undef inline
@@ -1300,18 +1307,20 @@ AC_DEFUN([TYPE_IN_ADDR_T],
             ]])
           ],[
             curl_cv_in_addr_t_equiv="$t"
-              break
           ])
-         done
-
-         if test "x$curl_cv_in_addr_t_equiv" = x; then
-            AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
         fi
+      done
     ])
-      AC_MSG_RESULT($curl_cv_in_addr_t_equiv)
+    case "$curl_cv_in_addr_t_equiv" in
+      unknown)
+        AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
+        ;;
+      *)
         AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
-			[type to use in place of in_addr_t if not defined])],
+          [Type to use in place of in_addr_t when system does not provide it.])
-      [
+        ;;
+    esac
+  ],[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1342,6 +1351,7 @@ AC_DEFUN([TYPE_IN_ADDR_T],
   ]) dnl AC_CHECK_TYPE
 ]) dnl AC_DEFUN
 
+
 dnl CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC
 dnl -------------------------------------------------
 dnl Check if monotonic clock_gettime is available.
@@ -1380,6 +1390,7 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [
   dnl postponed until library linking checks for clock_gettime pass.
 ]) dnl AC_DEFUN
 
+
 dnl CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC
 dnl -------------------------------------------------
 dnl If monotonic clock_gettime is available then,
@@ -1396,6 +1407,7 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
     curl_cv_gclk_LIBS="unknown"
     #
     for x_xlibs in '' '-lrt' '-lposix4' ; do
+      if test "$curl_cv_gclk_LIBS" = "unknown"; then
         if test -z "$x_xlibs"; then
           LIBS="$curl_cv_save_LIBS"
         else
@@ -1422,8 +1434,8 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
           ]])
         ],[
           curl_cv_gclk_LIBS="$x_xlibs"
-        break
         ])
+      fi
     done
     #
     LIBS="$curl_cv_save_LIBS"
@@ -1460,6 +1472,7 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
   #
 ]) dnl AC_DEFUN
 
+
 dnl **********************************************************************
 dnl CURL_DETECT_ICC ([ACTION-IF-YES])
 dnl