From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 2 Aug 2010 19:31:11 +0000 (-0400)
Subject: Add cross-compile defaults for remaining AC_TRY_RUN usage.
X-Git-Tag: SUDO_1_7_5~214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38fcf8b6ba03197d3e263ad08401eb9b02573a2e;p=sudo

Add cross-compile defaults for remaining AC_TRY_RUN usage.

--HG--
branch : 1.7
---

diff --git a/aclocal.m4 b/aclocal.m4
index 8d0cc2701..1276746a6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -227,7 +227,7 @@ AC_DEFUN([SUDO_FUNC_UNSETENV_VOID],
     ],
     [sudo_cv_func_unsetenv_void=no],
     [sudo_cv_func_unsetenv_void=yes],
-    [sudo_cv_func_unsetenv_void=yes])])
+    [sudo_cv_func_unsetenv_void=no])])
     if test $sudo_cv_func_unsetenv_void = yes; then
       AC_DEFINE(UNSETENV_VOID, 1,
         [Define to 1 if the `unsetenv' function returns void instead of `int'.])
@@ -289,7 +289,7 @@ main() {
   (void) fprintf(f, "%d\n", strlen(b));
   (void) fclose(f);
   exit(0);
-}], sudo_cv_uid_t_len=`cat conftestdata`, sudo_cv_uid_t_len=10)
+}], sudo_cv_uid_t_len=`cat conftestdata`, sudo_cv_uid_t_len=10, sudo_cv_uid_t_len=10)
 ])
 rm -f conftestdata
 AC_MSG_RESULT($sudo_cv_uid_t_len)
diff --git a/configure b/configure
index b3d859109..a4de2e7d4 100755
--- a/configure
+++ b/configure
@@ -14542,10 +14542,7 @@ if test "${sudo_cv_uid_t_len+set}" = set; then :
 else
   rm -f conftestdata
 if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+  sudo_cv_uid_t_len=10
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15087,7 +15084,7 @@ if test "${sudo_cv_func_unsetenv_void+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  sudo_cv_func_unsetenv_void=yes
+  sudo_cv_func_unsetenv_void=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */