From a66397eb9a05182ca24cd2677a236e248a927f27 Mon Sep 17 00:00:00 2001 From: MediaXtend Date: Sun, 9 Feb 2014 19:57:16 +0100 Subject: [PATCH 1/2] Added possibility to compile the PECL extension statically into PHP. --- config.m4 | 5 +++++ php_zbarcode.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/config.m4 b/config.m4 index 63819b1..a0e46e7 100644 --- a/config.m4 +++ b/config.m4 @@ -77,6 +77,10 @@ if test $PHP_ZBARCODE != "no"; then LIBS="$ORIG_LIBS" + if test -n "$prefix"; then + PHP_CONFIG="$prefix/bin/php-config" + fi + if test $PHP_ZBARCODE_IMAGICK != "no"; then AC_MSG_CHECKING(php_imagick_shared.h header file) @@ -119,4 +123,5 @@ if test $PHP_ZBARCODE != "no"; then AC_DEFINE(HAVE_ZBARCODE,1,[ ]) PHP_SUBST(ZBARCODE_SHARED_LIBADD) PHP_NEW_EXTENSION(zbarcode, zbarcode.c, $ext_shared,,$ZBARCODE_INCS) + PHP_INSTALL_HEADERS([ext/zbarcode], [php_zbarcode.h]) fi diff --git a/php_zbarcode.h b/php_zbarcode.h index 0cf328c..f0f1559 100644 --- a/php_zbarcode.h +++ b/php_zbarcode.h @@ -63,4 +63,7 @@ typedef struct _php_zbarcode_image_object { } php_zbarcode_image_object; /* }}} */ +extern zend_module_entry zbarcode_module_entry; +#define phpext_zbarcode_ptr &zbarcode_module_entry + #endif From d0cbec42383a46a5f46c32501f33bd2c3eb61987 Mon Sep 17 00:00:00 2001 From: MediaXtend Date: Sat, 10 Oct 2015 20:09:13 +0200 Subject: [PATCH 2/2] Again fixed autoconf configuration to support compilation of the PECL extension statically. --- config.m4 | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/config.m4 b/config.m4 index daffc13..5131c50 100644 --- a/config.m4 +++ b/config.m4 @@ -15,7 +15,12 @@ if test $PHP_ZBARCODE != "no"; then # # ImageMagick macros # - m4_include([imagemagick.m4]) + + if test "$ext_shared" != "yes" && test "$ext_shared" != "shared"; then + define('PHP_ZBARCODE_STATIC', 1) + PHP_ZBARCODE_STATIC=yes + fi + m4_include(ifdef('PHP_ZBARCODE_STATIC',PHP_EXT_BUILDDIR(zbarcode)[/],)[imagemagick.m4]) IM_FIND_IMAGEMAGICK(6002004, $PHP_ZBARCODE_IMAGEMAGICK_DIR) AC_MSG_CHECKING(zbar installation) @@ -59,17 +64,17 @@ if test $PHP_ZBARCODE != "no"; then # if test $PHP_ZBARCODE_IMAGICK != "no"; then AC_MSG_CHECKING(php_imagick_shared.h header file) - + if test -z "$PHP_CONFIG"; then AC_MSG_ERROR([php-config not found]) fi - + PHP_IMAGICK_HEADER="`$PHP_CONFIG --include-dir`/ext/imagick/php_imagick_shared.h" - + if test -r $PHP_IMAGICK_HEADER; then AC_MSG_RESULT(found.) AC_DEFINE(HAVE_ZBARCODE_IMAGICK,1,[ ]) - + PHP_ADD_EXTENSION_DEP(zbarcode, imagick) else AC_MSG_ERROR(not found. Run with --disable-zbarcode-imagick to disable this feature) @@ -82,13 +87,13 @@ if test $PHP_ZBARCODE != "no"; then if test $PHP_ZBARCODE_GD != "no"; then AC_MSG_CHECKING(ext/gd/php_gd.h header file) - + if test -z "$PHP_CONFIG"; then AC_MSG_ERROR([php-config not found]) fi - + PHP_GD_CHECK_HEADER="`$PHP_CONFIG --include-dir`/ext/gd/php_gd.h" - + if test -r $PHP_GD_CHECK_HEADER; then AC_MSG_RESULT(found.) else @@ -97,7 +102,7 @@ if test $PHP_ZBARCODE != "no"; then PHP_ADD_EXTENSION_DEP(zbarcode, gd) AC_DEFINE(HAVE_ZBARCODE_GD,1,[ ]) - fi + fi PHP_EVAL_LIBLINE($IM_IMAGEMAGICK_LIBS, ZBARCODE_SHARED_LIBADD) PHP_EVAL_INCLINE($IM_IMAGEMAGICK_CFLAGS)