blob: 50f7420a8dbcb6a067277bd4cbc1a269ab8dda53 (
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
|
Index: httpd-2.2.14/configure
===================================================================
--- httpd-2.2.14.orig/configure
+++ httpd-2.2.14/configure
@@ -3795,26 +3795,6 @@ if test "${with_apr+set}" = set; then :
else
- if test -n "1" && test "1" = "1"; then
- for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
- do
- if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
- apr_config="$apr_temp_apr_config_file"
-
- apr_found="yes"
- break
- else
- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
- apr_config="$lookdir/bin/$apr_temp_apr_config_file"
-
- apr_found="yes"
- break 2
- fi
- done
- fi
- done
- fi
if test "$apr_found" = "no" && test -d ""$srcdir/srclib/apr""; then
apr_temp_abs_srcdir="`cd "$srcdir/srclib/apr" && pwd`"
apr_found="reconfig"
@@ -4147,26 +4127,6 @@ if test "${with_apr_util+set}" = set; th
else
- if test -n "1" && test "1" = "1"; then
- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
- do
- if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
- apu_config="$apu_temp_apu_config_file"
-
- apu_found="yes"
- break
- else
- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
-
- apu_found="yes"
- break 2
- fi
- done
- fi
- done
- fi
if test "$apu_found" = "no" && test -d ""$srcdir/srclib/apr-util""; then
apu_temp_abs_srcdir="`cd "$srcdir/srclib/apr-util" && pwd`"
apu_found="reconfig"
@@ -7045,7 +7005,11 @@ if test "${ap_cv_void_ptr_lt_long+set}"
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- ap_cv_void_ptr_lt_long=yes
+ if test "$ac_cv_sizeof_long_p" = "$ac_cv_sizeof_void_p"; then
+ ap_void_ptr_lt_long=no
+ else
+ ap_void_ptr_lt_long=yes
+ fi
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
|
