aboutsummaryrefslogtreecommitdiff
path: root/recipes/squid/squid-3.1.9/fix-runs-in-configure.patch
blob: 35744a3f689127dcb6c8fdcca7baa3e47279e2a2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
Index: squid-3.1.8/configure.in
===================================================================
--- squid-3.1.8.orig/configure.in	2010-09-13 17:51:04.000000000 +0400
+++ squid-3.1.8/configure.in	2010-09-13 17:53:04.000000000 +0400
@@ -364,10 +364,6 @@
   fi
 ])
 
-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; } ]])],[],[],[:])
-
 dnl This is a developer only option.. developers know how to set defines
 dnl
 dnl AC_ARG_ENABLE(xmalloc-debug,
@@ -1318,7 +1314,7 @@
   dnl Verify that epoll really works
   if test $ac_cv_func_epoll_ctl = yes; then
     AC_CACHE_CHECK(if epoll works, ac_cv_epoll_works,
-      AC_RUN_IFELSE([AC_LANG_SOURCE([[
+      AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <sys/epoll.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -3072,7 +3068,7 @@
 dnl setresuid() but doesn't implement it.
 dnl
 AC_CACHE_CHECK(if setresuid is implemented, ac_cv_func_setresuid,
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <stdlib.h>
   int main(int argc, char **argv) {
     if(setresuid(-1,-1,-1)) {
@@ -3092,7 +3088,7 @@
 dnl copy that crashes with a buffer over-run!
 dnl
 AC_CACHE_CHECK(if strnstr is well implemented, ac_cv_func_strnstr,
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -3118,7 +3114,7 @@
 dnl Test for va_copy
 dnl
 AC_CACHE_CHECK(if va_copy is implemented, ac_cv_func_va_copy,
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
       #include <stdarg.h>
       #include <stdlib.h>
       int f (int i, ...) {
@@ -3141,7 +3137,7 @@
 dnl Some systems support __va_copy
 dnl
 AC_CACHE_CHECK(if __va_copy is implemented, ac_cv_func___va_copy,
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
       #include <stdarg.h>
       #include <stdlib.h>
       int f (int i, ...) {
Index: squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in
===================================================================
--- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-09-04 07:25:58.000000000 +0400
+++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-09-13 17:52:15.000000000 +0400
@@ -367,13 +367,13 @@
 
 CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
 AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
-AC_TRY_RUN([
+AC_TRY_COMPILE([
 #include <config.h>
 int main(int argc, char *argv[]) {
 #ifdef SQUID_CONFIG_H
 return 0;
 #else
-return 1;
+boom!
 #endif
 }],
   ac_cv_have_squid=yes,