cvs: pecl /paradox config.m4 paradox.c php_paradox.h

steinm Fri Jul 25 02:42:40 2003 EDT Modified files: /pecl/paradox config.m4 paradox.c php_paradox.h Log: - added HAVE_PARADOX to disable extension, just in case somebody wants\n to compile this extension with php-src Index: pecl/paradox/config.m4 diff -u pecl/paradox/config.m4:1.1 pecl/paradox/config.m4:1.2 --- pecl/paradox/config.m4:1.1 Wed Jul 23 08:09:37 2003 +++ pecl/paradox/config.m4 Fri Jul 25 02:42:40 2003 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.1 2003/07/23 12:09:37 steinm Exp $ +dnl $Id: config.m4,v 1.2 2003/07/25 06:42:40 steinm Exp $ dnl config.m4 for extension paradox PHP_ARG_WITH(paradox, for paradox support, Make sure that the comment is aligned: - [ --with-paradox Include paradox support]) + [ --with-paradox[=DIR] Include paradox support]) if test "$PHP_PARADOX" != "no"; then dnl Write more examples of tests here... @@ -45,5 +45,6 @@ PHP_SUBST(PARADOX_SHARED_LIBADD) + AC_DEFINE(HAVE_PARADOX,1,[ ]) PHP_NEW_EXTENSION(paradox, paradox.c, $ext_shared) fi Index: pecl/paradox/paradox.c diff -u pecl/paradox/paradox.c:1.1 pecl/paradox/paradox.c:1.2 --- pecl/paradox/paradox.c:1.1 Wed Jul 23 08:09:37 2003 +++ pecl/paradox/paradox.c Fri Jul 25 02:42:40 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: paradox.c,v 1.1 2003/07/23 12:09:37 steinm Exp $ */ +/* $Id: paradox.c,v 1.2 2003/07/25 06:42:40 steinm Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -26,6 +26,9 @@ #include "php_ini.h" #include "ext/standard/info.h" #include "ext/standard/php_string.h" + +#if HAVE_PARADOX + #include "php_paradox.h" /* If you declare any globals in php_paradox.h uncomment this: @@ -215,7 +218,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "paradox support", "enabled"); php_info_print_table_row(2, "pxlib Version", tmp ); - php_info_print_table_row(2, "Revision", "$Revision: 1.1 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.2 $" ); php_info_print_table_end(); /* Remove comments if you have entries in php.ini @@ -565,6 +568,7 @@ } /* }}} */ +#endif /* * Local variables: * tab-width: 4 Index: pecl/paradox/php_paradox.h diff -u pecl/paradox/php_paradox.h:1.1 pecl/paradox/php_paradox.h:1.2 --- pecl/paradox/php_paradox.h:1.1 Wed Jul 23 08:09:37 2003 +++ pecl/paradox/php_paradox.h Fri Jul 25 02:42:40 2003 @@ -16,11 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_paradox.h,v 1.1 2003/07/23 12:09:37 steinm Exp $ */ +/* $Id: php_paradox.h,v 1.2 2003/07/25 06:42:40 steinm Exp $ */ #ifndef PHP_PARADOX_H #define PHP_PARADOX_H +#if HAVE_PARADOX + #include <paradox.h> extern zend_module_entry paradox_module_entry; @@ -82,8 +84,11 @@ #define PARADOX_G(v) (paradox_globals.v) #endif -#endif /* PHP_PARADOX_H */ +#else +#define phpext_paradox_ptr NULL +#endif /* HAVE_PARADOX */ +#endif /* PHP_PARADOX_H */ /* * Local variables: