From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 29 Aug 2010 14:07:18 +0000 (-0600)
Subject: Fix cross-compile support in ./configure
X-Git-Tag: take1~321
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aff0e8fedc8bf69b54c11d9eaaa58390e706aeee;p=thirdparty%2Fsquid.git

Fix cross-compile support in ./configure
---

diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
index 38e225c23b..f572b3da99 100644
--- a/acinclude/krb5.m4
+++ b/acinclude/krb5.m4
@@ -95,7 +95,7 @@ main()
     return krb5_cc_resolve(context, "MEMORY:test_cache", &cc);
 }
       ]])
-    ], [ squid_cv_memory_cache=yes ], [ squid_cv_memory_cache=no ])
+    ], [ squid_cv_memory_cache=yes ], [ squid_cv_memory_cache=no ], [:])
   ])
 ])
 
@@ -133,7 +133,7 @@ main(void)
 
         return 0;
 }
-  ]])],  [ squid_cv_working_gssapi=yes ], [ squid_cv_working_gssapi=no ])])
+  ]])],  [ squid_cv_working_gssapi=yes ], [ squid_cv_working_gssapi=no ], [:])])
 ])
 
 
@@ -180,7 +180,7 @@ gss_OID gss_mech_spnego = &_gss_mech_spnego;
  return 1;
 }
   ]])],  
-  [ squid_cv_have_spnego=yes ], [ squid_cv_have_spnego=no ])])
+  [ squid_cv_have_spnego=yes ], [ squid_cv_have_spnego=no ],[:])])
 ])
 
 dnl checks that krb5 is functional. Sets squid_cv_working_krb5
@@ -207,5 +207,5 @@ main(void)
 
         return 0;
 }
-  ]])], [ squid_cv_working_krb5=yes ], [ squid_cv_working_krb5=no ])])
+  ]])], [ squid_cv_working_krb5=yes ], [ squid_cv_working_krb5=no ],[:])])
 ])
diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
index 682300b04e..2ae250bd9b 100644
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     strnstr(str, "fubar", size);
     return 0;
 }
-  ]])],[squid_cv_func_strnstr="yes"],[squid_cv_func_strnstr="no"],[])
+  ]])],[squid_cv_func_strnstr="yes"],[squid_cv_func_strnstr="no"],[:])
 )
 if test "$squid_cv_func_strnstr" = "yes" ; then
   AC_DEFINE(HAVE_STRNSTR,1)
@@ -79,7 +79,7 @@ AC_CACHE_CHECK(if va_copy is implemented, squid_cv_func_va_copy,
          return 0;
       }
       int main(int argc, char **argv) { return f (0, 42); }
-      ]])],[squid_cv_func_va_copy="yes"],[squid_cv_func_va_copy="no"],[])
+      ]])],[squid_cv_func_va_copy="yes"],[squid_cv_func_va_copy="no"],[:])
 )
 if test "$squid_cv_func_va_copy" = "yes" ; then
   AC_DEFINE(HAVE_VA_COPY, 1)
@@ -106,7 +106,7 @@ AC_CACHE_CHECK(if __va_copy is implemented, squid_cv_func___va_copy,
          return 0;
       }
       int main(int argc, char **argv) { return f (0, 42); }
-      ]])],[squid_cv_func___va_copy="yes"],[squid_cv_func___va_copy="no"],[])
+      ]])],[squid_cv_func___va_copy="yes"],[squid_cv_func___va_copy="no"],[:])
 )
 if test "$squid_cv_func___va_copy" = "yes" ; then
   AC_DEFINE(HAVE___VA_COPY, 1)
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
     }
     return 0;
 }
-      ]])],[squid_cv_epoll_works=yes],[squid_cv_epoll_works=no],[]))
+      ]])],[squid_cv_epoll_works=yes],[squid_cv_epoll_works=no],[:]))
 
 ]) dnl SQUID_CHECK_EPOLL
 
@@ -811,6 +811,6 @@ AC_DEFUN([SQUID_CHECK_SETRESUID_WORKS],[
   }
   ]])],[
     squid_cv_resuid_works="yes" ],[
-    squid_cv_resuid_works="no" ],[])
+    squid_cv_resuid_works="no" ],[:])
   )
 ])
diff --git a/configure.in b/configure.in
index 81ef1b73e6..c06564908f 100644
--- a/configure.in
+++ b/configure.in
@@ -345,7 +345,7 @@ AC_MSG_NOTICE([cbdata debugging enabled: $enable_debug_cbdata])
 
 dnl Nasty hack to get autoconf 2.64 on Linux to run.
 dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64
-AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[])
+AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
 
 dnl This is a developer only option.. developers know how to set defines
 dnl
@@ -2558,7 +2558,8 @@ case "$host_os" in
 		]])], 
 		[ AC_DEFINE(HAVE_LDAP, 1, [LDAP support]) 
 		  AC_MSG_RESULT(yes) ],
-		[ AC_MSG_RESULT(no) ])
+		[ AC_MSG_RESULT(no) ],
+		[ AC_MSG_RESULT(cross-compiler cant tell) ])
 		LIBS=$oLIBS
 
 		dnl
@@ -2578,7 +2579,8 @@ case "$host_os" in
 		]])], 
 		[ AC_DEFINE(HAVE_OPENLDAP, 1, [OpenLDAP support]) 
 		  AC_MSG_RESULT(yes) ],
-		[ AC_MSG_RESULT(no) ])
+		[ AC_MSG_RESULT(no) ],
+		[ AC_MSG_RESULT(cross-compiler cant tell) ])
 
 		AC_MSG_CHECKING([for Sun LDAP SDK])
 		AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -2594,7 +2596,8 @@ case "$host_os" in
 		]])], 
 		[ AC_DEFINE(HAVE_SUN_LDAP_SDK, 1, [Sun LDAP SDK support])
 		  AC_MSG_RESULT(yes) ],
-		[ AC_MSG_RESULT(no) ])
+		[ AC_MSG_RESULT(no) ],
+		[ AC_MSG_RESULT(cross-compiler cant tell) ])
 
 		AC_MSG_CHECKING([for Mozilla LDAP SDK])
 		AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -2612,7 +2615,8 @@ case "$host_os" in
 		]])], 
 		[ AC_DEFINE(HAVE_MOZILLA_LDAP_SDK, 1, [Mozilla LDAP SDK support])
 		  AC_MSG_RESULT(yes) ],
-		[ AC_MSG_RESULT(no)])
+		[ AC_MSG_RESULT(no)],
+		[ AC_MSG_RESULT(cross-compiler cant tell) ])
 
 		dnl
 		dnl Check for LDAP_REBINDPROC_CALLBACK