Re: cvs: php4(PHP_4_0_6) /ext/curl config.m4
| From: | Jani Taskinen | Date: | Mon, 21 May 2001 20:24:08 +0000 |
| Subject: | Re: cvs: php4(PHP_4_0_6) /ext/curl config.m4 | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-5912@lists.php.net to get a copy of this message | ||
Why don't you use the define in curl.h:
/* This is the version number */
#define LIBCURL_VERSION "7.7.4-pre1"
#define LIBCURL_VERSION_NUM 0x070704
??
Like it's done with OpenSSL.. ? (acinclude.m4)
It would be cleaner.
--Jani
On Mon, 21 May 2001, Sterling Hughes wrote:
>sterling Mon May 21 13:12:36 2001 EDT
>
> Modified files: (Branch: PHP_4_0_6)
> /php4/ext/curl config.m4
> Log:
> MFH
>
>
>
>Index: php4/ext/curl/config.m4
>diff -u php4/ext/curl/config.m4:1.5 php4/ext/curl/config.m4:1.5.2.1
>--- php4/ext/curl/config.m4:1.5 Tue Mar 27 12:34:23 2001
>+++ php4/ext/curl/config.m4 Mon May 21 13:12:35 2001
>@@ -1,4 +1,4 @@
>-dnl $Id: config.m4,v 1.5 2001/03/27 20:34:23 sniper Exp $
>+dnl $Id: config.m4,v 1.5.2.1 2001/05/21 20:12:35 sterling Exp $
> dnl config.m4 for extension CURL
>
> PHP_ARG_WITH(curl, for CURL support,
>@@ -21,6 +21,21 @@
> AC_MSG_RESULT(not found)
> AC_MSG_ERROR(Please reinstall the libcurl distribution -
> easy.h should be in <curl-dir>/include/curl/)
>+ fi
>+
>+ CURL_CONFIG="curl-config"
>+ AC_MSG_CHECKING(for cURL greater than 7.7.3)
>+
>+ if ${CURL_DIR}/bin/curl-config --libs print > /dev/null 2>&1; then
>+ CURL_CONFIG=${CURL_DIR}/bin/curl-config
>+ fi
>+
>+ curl_version_full=
$CURL_CONFIG --version
>+ curl_version=echo ${curl_version_full} | sed -e 's/libcurl //' |
>awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 +
>$3;}'
>+ if test "$curl_version" -ge 7007003; then
>+ AC_MSG_RESULT($curl_version_full)
>+ else
>+ AC_MSG_ERROR(cURL version 7.7.3 or later is required to compile php with cURL support)
> fi
>
> PHP_ADD_INCLUDE($CURL_DIR/include)
>
>
>
>