Commit 24d41452 authored by Yang Tse's avatar Yang Tse
Browse files

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

AC_FOO_IFELSE macros, otherwise temp files are not removed.

Identation adjustment.
parent 2597020d
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@

                                  Changelog

Yang Tse (18 Jun 2008)
- Internal configure script improvement. No longer break out of shell "for"
  statements from inside AC_FOO_IFELSE macros, otherwise temporary macro files
  are not properly removed.

Daniel Fandrich (12 Jun 2008)
- Fixed curl-config --ca which wasn't being exported by configure.

+171 −156
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [
  #
  for x_nlibs in '' "$u_libs" \
    '-lwldap32' ; do
    if test "$curl_cv_ldap_LIBS" = "unknown"; then
      if test -z "$x_nlibs"; then
        LIBS="$curl_cv_save_LIBS"
      else
@@ -583,8 +584,8 @@ AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [
        ]])
      ],[
        curl_cv_ldap_LIBS="$x_nlibs"
      break
      ])
    fi
  done
  #
  LIBS="$curl_cv_save_LIBS"
@@ -651,6 +652,7 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
    '-lldap -llber' \
    '-lldapssl -lldapx -lldapsdk' \
    '-lldapsdk -lldapx -lldapssl' ; do
    if test "$curl_cv_ldap_LIBS" = "unknown"; then
      if test -z "$x_nlibs"; then
        LIBS="$curl_cv_save_LIBS"
      else
@@ -690,8 +692,8 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
        ]])
      ],[
        curl_cv_ldap_LIBS="$x_nlibs"
      break
      ])
    fi
  done
  #
  LIBS="$curl_cv_save_LIBS"
@@ -782,6 +784,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
@@ -814,8 +817,8 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
                ]])
              ],[
                curl_cv_socklen_t_equiv="$t"
               break 3
              ])
            fi
          done
        done
      done
@@ -944,6 +947,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 
@@ -988,8 +992,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
@@ -1249,6 +1253,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 
@@ -1274,7 +1279,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;
@@ -1284,8 +1290,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
@@ -1381,6 +1387,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 
@@ -1406,7 +1413,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;
@@ -1415,8 +1423,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
@@ -1789,14 +1797,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])
      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
      [
         curl_cv_in_addr_t_equiv=
    dnl in_addr_t not available
    AC_CACHE_CHECK([for in_addr_t equivalent],
      [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
@@ -1831,18 +1840,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
@@ -1873,6 +1884,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.
@@ -1911,6 +1923,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,
@@ -1927,6 +1940,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
@@ -1953,8 +1967,8 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
          ]])
        ],[
          curl_cv_gclk_LIBS="$x_xlibs"
        break
        ])
      fi
    done
    #
    LIBS="$curl_cv_save_LIBS"
@@ -2065,6 +2079,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
        for sel_arg1 in 'int' 'ssize_t' 'size_t' 'unsigned long int' 'unsigned int'; do
          for sel_arg234 in 'fd_set *' 'int *' 'void *'; do
            for sel_arg5 in 'struct timeval *' 'const struct timeval *'; do
              if test "$curl_cv_func_select_args" = "unknown"; then
                AC_COMPILE_IFELSE([
                  AC_LANG_PROGRAM([[
#undef inline
@@ -2124,8 +2139,8 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
                  ]])
                ],[
                  curl_cv_func_select_args="$sel_arg1,$sel_arg234,$sel_arg5,$sel_retv"
                 break 4
                ])
              fi
            done
          done
        done
+110 −97
Original line number Diff line number Diff line
@@ -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])
      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
      [
         curl_cv_in_addr_t_equiv=
    dnl in_addr_t not available
    AC_CACHE_CHECK([for in_addr_t equivalent],
      [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