projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update README
[m6w6/ext-http]
/
autoconf
/
pecl
/
pecl.m4
diff --git
a/autoconf/pecl/pecl.m4
b/autoconf/pecl/pecl.m4
index e6cd7921d35b367c69d24de21cc479468c7980f4..ffa45ac03fe88cf746f84378199040747f242ce6 100644
(file)
--- a/
autoconf/pecl/pecl.m4
+++ b/
autoconf/pecl/pecl.m4
@@
-70,6
+70,15
@@
AC_DEFUN([PECL_RESTORE_ENV], [
$1=$PECL_SAVE_VAR([$2_$1])
])
dnl
$1=$PECL_SAVE_VAR([$2_$1])
])
dnl
+dnl PECL_EVAL_LIBLINE(libline)
+dnl
+AC_DEFUN([PECL_EVAL_LIBLINE], [
+ PECL_SAVE_ENV(ext_shared, pecl)
+ ext_shared=no
+ PHP_EVAL_LIBLINE([$1], _pecl_eval_libline_dummy)
+ PECL_RESTORE_ENV(ext_shared, pecl)
+])
+dnl
dnl PECL_PROG_EGREP
dnl
dnl Checks for an egrep. Defines $EGREP.
dnl PECL_PROG_EGREP
dnl
dnl Checks for an egrep. Defines $EGREP.
@@
-184,6
+193,7
@@
AC_DEFUN([PECL_HAVE_CONST], [dnl
#include "$1"
], [
]ifelse([$3],,int,[$3])[ _c = $2;
#include "$1"
], [
]ifelse([$3],,int,[$3])[ _c = $2;
+ (void) _c;
], [
PECL_CACHE_VAR([HAVE_$1_$2])=yes
], [
], [
PECL_CACHE_VAR([HAVE_$1_$2])=yes
], [
@@
-220,7
+230,7
@@
AC_DEFUN([PECL_HAVE_VERSION], [
aversion=_PECL_TR_VERSION([$PECL_CHECKED_VERSION([$1])])
mversion=_PECL_TR_VERSION([$2])
AC_MSG_CHECKING([whether $1 version $PECL_CHECKED_VERSION([$1]) >= $2])
aversion=_PECL_TR_VERSION([$PECL_CHECKED_VERSION([$1])])
mversion=_PECL_TR_VERSION([$2])
AC_MSG_CHECKING([whether $1 version $PECL_CHECKED_VERSION([$1]) >= $2])
- if test "$aversion" -lt "$mversion"; then
+ if test
-z "$aversion" || test
"$aversion" -lt "$mversion"; then
ifelse($4,,AC_MSG_ERROR([no]), [
AC_MSG_RESULT([no])
$4
ifelse($4,,AC_MSG_ERROR([no]), [
AC_MSG_RESULT([no])
$4
@@
-253,7
+263,8
@@
AC_DEFUN([PECL_CHECK_CUSTOM], [
CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
LIBS="-l$4"
CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
LIBS="-l$4"
-
+ PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+
AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
PECL_CACHE_VAR([$1_version])=$5
AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
PECL_CACHE_VAR([$1_version])=$5
@@
-309,6
+320,7
@@
AC_DEFUN([PECL_CHECK_CONFIG], [
PECL_CACHE_VAR([$1_libs])=$($2 $6)
])
LIBS=$PECL_CACHE_VAR([$1_libs])
PECL_CACHE_VAR([$1_libs])=$($2 $6)
])
LIBS=$PECL_CACHE_VAR([$1_libs])
+ PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
ifelse($2, [$PKG_CONFIG $1], [
fi
])
ifelse($2, [$PKG_CONFIG $1], [
fi
])
@@
-328,8
+340,16
@@
dnl PECL_CHECK_PKGCONFIG(pkg[, additional-pkg-config-path])
dnl
AC_DEFUN([PECL_CHECK_PKGCONFIG], [dnl
AC_REQUIRE([PECL_PROG_PKGCONFIG])dnl
dnl
AC_DEFUN([PECL_CHECK_PKGCONFIG], [dnl
AC_REQUIRE([PECL_PROG_PKGCONFIG])dnl
- ifelse($2,,,PKG_CONFIG_PATH="$2/lib/pkgconfig:$PKG_CONFIG_PATH")
+ ifelse($2,,, [
+ PECL_SAVE_VAR(pkgconfig_path)="$PKG_CONFIG_PATH"
+ if test -d "$2"; then
+ export PKG_CONFIG_PATH="$2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ fi
+ ])
PECL_CHECK_CONFIG([$1], [$PKG_CONFIG $1], [--modversion], [--cflags-only-I], [--libs-only-L], [--libs-only-l])
PECL_CHECK_CONFIG([$1], [$PKG_CONFIG $1], [--modversion], [--cflags-only-I], [--libs-only-L], [--libs-only-l])
+ ifelse($2,,, [
+ PKG_CONFIG_PATH="$PECL_SAVE_VAR(pkgconfig_path)"
+ ])
])
dnl
dnl PECL_CHECK_DONE(name, success[, incline, libline])
])
dnl
dnl PECL_CHECK_DONE(name, success[, incline, libline])