diff options
| author | Remi Collet <remi@php.net> | 2014-10-01 09:26:46 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-10-01 09:26:46 +0200 |
| commit | f584b67eaa20ecd2f63d5dd20c8fffe04b0fb11b (patch) | |
| tree | ea58f4c2612a2cc2107108d90224442afeb7dcee /ext/ext_skel | |
| parent | df4d559881ed42a6dc2ffbbd6c3ff10ba34df059 (diff) | |
| parent | 7319298ffe514aa0ddfbcd522a4f5286f6a6c3cc (diff) | |
| download | php-git-f584b67eaa20ecd2f63d5dd20c8fffe04b0fb11b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
use $PHP_LIBDIR instread of "lib" in skel example
Diffstat (limited to 'ext/ext_skel')
| -rwxr-xr-x | ext/ext_skel | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/ext_skel b/ext/ext_skel index e6b01fd4fc..c0c398d15e 100755 --- a/ext/ext_skel +++ b/ext/ext_skel @@ -156,12 +156,12 @@ if test "\$PHP_$EXTNAME" != "no"; then dnl PHP_CHECK_LIBRARY(\$LIBNAME,\$LIBSYMBOL, dnl [ - dnl PHP_ADD_LIBRARY_WITH_PATH(\$LIBNAME, \$${EXTNAME}_DIR/lib, ${EXTNAME}_SHARED_LIBADD) + dnl PHP_ADD_LIBRARY_WITH_PATH(\$LIBNAME, \$${EXTNAME}_DIR/\$PHP_LIBDIR, ${EXTNAME}_SHARED_LIBADD) dnl AC_DEFINE(HAVE_${EXTNAME}LIB,1,[ ]) dnl ],[ dnl AC_MSG_ERROR([wrong $extname lib version or lib not found]) dnl ],[ - dnl -L\$${EXTNAME}_DIR/lib -lm + dnl -L\$${EXTNAME}_DIR/\$PHP_LIBDIR -lm dnl ]) dnl dnl PHP_SUBST(${EXTNAME}_SHARED_LIBADD) |