diff --git a/config.m4 b/config.m4 index 2d558ff..1b614b7 100644 --- a/config.m4 +++ b/config.m4 @@ -3,25 +3,36 @@ PHP_ARG_WITH(tutorial) if test "$PHP_TUTORIAL" != "no"; then - dnl Check for required libcurl library - AC_MSG_CHECKING([for libcurl]) - for i in $PHP_TUTORIAL /usr/local /usr; do - if test -f "$i/include/curl/easy.h"; then - PHP_CURL_DIR=$i - break - fi - done - if test -z "$PHP_CURL_DIR"; then - AC_MSG_ERROR([not found]) + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libcurl; then + CURL_INCLUDES=`pkg-config --cflags-only-I libcurl` + CURL_LIBS=`pkg-config --libs-only-l libcurl` + PHP_ADD_INCLUDE($CURL_INCLUDES) + PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_LIBS, TUTORIAL_SHARED_LIBADD) + PHP_SUBST(TUTORIAL_SHARED_LIBADD) + else + dnl Check for required libcurl library + AC_MSG_CHECKING([for libcurl]) + for i in $PHP_TUTORIAL /usr/local /usr; do + if test -f "$i/include/curl/easy.h"; then + PHP_CURL_DIR=$i + break + fi + done + if test -z "$PHP_CURL_DIR"; then + AC_MSG_ERROR([not found]) + fi - dnl Found libcurl's headers - AC_MSG_RESULT([found in $PHP_CURL_DIR]) + dnl Found libcurl's headers + AC_MSG_RESULT([found in $PHP_CURL_DIR]) - dnl Update library list and include paths for libcurl - PHP_ADD_INCLUDE($PHP_CURL_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(curl, $PHP_CURL_DIR/$PHP_LIB_DIR, TUTORIAL_SHARED_LIBADD) - PHP_SUBST(TUTORIAL_SHARED_LIBADD) + dnl Update library list and include paths for libcurl + PHP_ADD_INCLUDE($PHP_CURL_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(curl, $PHP_CURL_DIR/$PHP_LIB_DIR, TUTORIAL_SHARED_LIBADD) + PHP_SUBST(TUTORIAL_SHARED_LIBADD) + fi PHP_NEW_EXTENSION(tutorial, tutorial.c, $ext_shared) fi