diff --git a/config.m4 b/config.m4 index f214922..6b04014 100644 --- a/config.m4 +++ b/config.m4 @@ -93,16 +93,20 @@ if test "${K2H_HAVE_PHP_BINARY}" = "yes"; then AC_SUBST([K2H_PHP_MAJOR_VERSION], [$(php -r 'echo "".PHP_MAJOR_VERSION."";')]) AC_SUBST([K2H_PHP_MINOR_VERSION], [$(php -r 'echo "".PHP_MINOR_VERSION."";')]) AC_SUBST([K2H_EXT_PKGNAME], [$(head -n 1 $(pwd)/ChangeLog | awk '{print $1}')]) - AC_SUBST([K2H_EXT_VERSION], [$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/-.*$//g')]) AC_SUBST([K2H_EXT_RELEASE], [$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/^.*-//g')]) + AC_SUBST([K2H_EXT_VERSION], [$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/-.*$//g')]) + + AC_DEFINE_UNQUOTED(PHP_K2HASH_VERSION, ["$(head -n 1 $(pwd)/ChangeLog | sed -e 's/[(]//g' -e 's/[)]//g' | awk '{print $2}' | sed -e 's/-.*$//g')"], [ PHP Extension version ]) else AC_SUBST([K2H_PHP_VERSION], "0.0") AC_SUBST([K2H_PHP_RAW_VERSION], "00") AC_SUBST([K2H_PHP_MAJOR_VERSION], "0") AC_SUBST([K2H_PHP_MINOR_VERSION], "0") AC_SUBST([K2H_EXT_PKGNAME], "php-pecl-k2hash") - AC_SUBST([K2H_EXT_VERSION], "0.0.0") AC_SUBST([K2H_EXT_RELEASE], "0") + AC_SUBST([K2H_EXT_VERSION], "0.0.0") + + AC_DEFINE(PHP_K2HASH_VERSION, "0.0.0", [ PHP Extension version ]) fi # diff --git a/php_k2hash.h b/php_k2hash.h index 4b82553..cca9292 100644 --- a/php_k2hash.h +++ b/php_k2hash.h @@ -23,11 +23,9 @@ #include #include +#include "config.h" extern zend_module_entry k2hash_module_entry; -# define k2hash_ptr &k2hash_module_entry - -# define PHP_K2HASH_VERSION "1.1.3" /* {{{ k2hash object */ typedef struct php_k2hash_object_ {