Skip to content

Commit bc262ee

Browse files
authored
Update config.m4
1 parent 64a3932 commit bc262ee

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

ext/curl/config.m4

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,23 @@ if test "$PHP_CURL" != "no"; then
1717
break
1818
fi
1919
done
20-
if which dpkg-architecture; then
21-
AC_MSG_CHECKING(for cURL in multiarch path)
22-
CURL_MULTIARCH_INCLUDE=/usr/include/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
23-
if test -r $CURL_MULTIARCH_INCLUDE/curl/easy.h; then
24-
CURL_DIR=/usr
25-
AC_MSG_RESULT(found in $CURL_MULTIARCH_INCLUDE)
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
2631
fi
2732
fi
2833
fi
2934

3035
if test -z "$CURL_DIR"; then
31-
AC_MSG_RESULT(not found)
32-
AC_MSG_ERROR(Please reinstall the libcurl distribution -
36+
AC_MSG_ERROR(Could not find cURL, please reinstall the libcurl distribution -
3337
easy.h should be in <curl-dir>/include/curl/)
3438
fi
3539

0 commit comments

Comments
 (0)