Get rid of HAVE_EXTNAME. This dates back to PHP 3 where source files

were unconditionally compiled. It is not necessary in PHP 4.

diff --git a/ext/ext_skel b/ext/ext_skel
index d34f4c62b8ea1c3a1fd94e6c42c15e45da7e8868..98f456916bd30be3b6948a9c06e5122faa0fec6d 100755 (executable)
--- a/ext/ext_skel
+++ b/ext/ext_skel
@@ -131,7 +131,6 @@ if test "\$PHP_$EXTNAME" != "no"; then
   dnl If you will not be testing anything external, like existence of
   dnl headers, libraries or functions in them, just uncomment the 
   dnl following line and you are ready to go.
-  dnl AC_DEFINE(HAVE_$EXTNAME, 1, [ ])
   dnl Write more examples of tests here...
   PHP_EXTENSION($extname, \$ext_shared)
 fi

diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
index 2fadf2b08704d40e2f4490f08431260110f84179..9f052040fbd4e745e9f57fd085621a2a89386a56 100644 (file)
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -3,11 +3,6 @@
 #ifndef PHP_EXTNAME_H
 #define PHP_EXTNAME_H
 
-/* You should tweak config.m4 so this symbol (or some else suitable)
-   gets defined.
-*/
-#if HAVE_EXTNAME
-
 extern zend_module_entry extname_module_entry;
 #define phpext_extname_ptr &extname_module_entry
 
@@ -50,12 +45,6 @@ ZEND_END_MODULE_GLOBALS(extname)
 #define EXTNAMELS_FETCH()
 #endif
 
-#else
-
-#define phpext_extname_ptr NULL
-
-#endif
-
 #endif /* PHP_EXTNAME_H */
 
 /* __footer_here__ */

diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index 5bb696ae61d44f87caeac57e0102f77456f31852..7b2d63b1ea8f91a9331782411c4b98663b3f9e35 100644 (file)
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -4,11 +4,6 @@
 #include "php_ini.h"
 #include "php_extname.h"
 
-/* You should tweak config.m4 so this symbol (or some else suitable)
-   gets defined.
-*/
-#if HAVE_EXTNAME
-
 /* If you declare any globals in php_extname.h uncomment this:
 ZEND_DECLARE_MODULE_GLOBALS(extname)
 */
@@ -114,6 +109,4 @@ PHP_FUNCTION(confirm_extname_compiled)
 
 /* __function_stubs_here__ */
 
-#endif /* HAVE_EXTNAME */
-
 /* __footer_here__ */