@@ -10,31 +10,19 @@ if test "$PHP_CURL" != "no"; then
10
10
CURL_DIR=$PHP_CURL
11
11
else
12
12
AC_MSG_CHECKING ( for cURL in default path )
13
- for i in /usr/local /usr; do
14
- if test -r $i/include /curl/easy.h; then
13
+ for i in /usr/local /usr /system ; do
14
+ if test -r $i/develop/headers /curl/easy.h; then
15
15
CURL_DIR=$i
16
16
AC_MSG_RESULT ( found in $i )
17
17
break
18
18
fi
19
19
done
20
- if test -z "$CURL_DIR"; then
21
- AC_MSG_RESULT ( not found )
22
- if which dpkg-architecture>/dev/null; then
23
- AC_MSG_CHECKING ( for cURL in multiarch path )
24
- CURL_MULTIARCH_INCLUDE=/usr/include/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
25
- if test -r $CURL_MULTIARCH_INCLUDE/curl/easy.h; then
26
- CURL_DIR=/usr
27
- AC_MSG_RESULT ( found in $CURL_MULTIARCH_INCLUDE )
28
- else
29
- AC_MSG_RESULT ( not found )
30
- fi
31
- fi
32
- fi
33
20
fi
34
21
35
22
if test -z "$CURL_DIR"; then
36
- AC_MSG_ERROR ( Could not find cURL , please reinstall the libcurl distribution -
37
- easy.h should be in <curl-dir>/include/curl/ )
23
+ AC_MSG_RESULT ( not found )
24
+ AC_MSG_ERROR ( Please reinstall the libcurl distribution -
25
+ easy.h should be in <curl-dir>/develop/headers/curl/ )
38
26
fi
39
27
40
28
CURL_CONFIG="curl-config"
@@ -57,11 +45,7 @@ if test "$PHP_CURL" != "no"; then
57
45
AC_MSG_ERROR ( cURL version 7.10.5 or later is required to compile php with cURL support )
58
46
fi
59
47
60
- if test -z "$CURL_MULTIARCH_INCLUDE"; then
61
- PHP_ADD_INCLUDE($CURL_DIR/include)
62
- else
63
- PHP_ADD_INCLUDE($CURL_MULTIARCH_INCLUDE)
64
- fi
48
+ PHP_ADD_INCLUDE($CURL_DIR/include)
65
49
PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
66
50
PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
67
51
@@ -73,13 +57,10 @@ if test "$PHP_CURL" != "no"; then
73
57
74
58
save_CFLAGS="$CFLAGS"
75
59
CFLAGS="`$CURL_CONFIG --cflags`"
76
- save_LDFLAGS="$LDFLAGS"
77
- LDFLAGS="`$CURL_CONFIG --libs`"
78
60
79
61
AC_PROG_CPP
80
62
AC_MSG_CHECKING ( [ for openssl support in libcurl] )
81
63
AC_TRY_RUN ( [
82
- #include <strings.h>
83
64
#include <curl/curl.h>
84
65
85
66
int main(int argc, char *argv[ ] )
@@ -107,7 +88,6 @@ int main(int argc, char *argv[])
107
88
108
89
AC_MSG_CHECKING ( [ for gnutls support in libcurl] )
109
90
AC_TRY_RUN ( [
110
- #include <strings.h>
111
91
#include <curl/curl.h>
112
92
113
93
int main(int argc, char *argv[ ] )
@@ -134,7 +114,6 @@ int main(int argc, char *argv[])
134
114
] )
135
115
136
116
CFLAGS="$save_CFLAGS"
137
- LDFLAGS="$save_LDFLAGS"
138
117
else
139
118
AC_MSG_RESULT ( [ no] )
140
119
fi
0 commit comments