Use the hardly-documented third parameter of AM_INIT_AUTOMAKE to suppress

defining PACKAGE/VERSION.

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index e060cd238b144bcf7fa056267e97de309b18da30..fa789b673247a9580a8c83efa625c1b33ff7a396 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -14,11 +14,7 @@
 #define TSRM_H
 
 #ifdef HAVE_CONFIG_H
-# undef PACKAGE
-# undef VERSION
 # include "tsrm_config.h"
-# undef PACKAGE
-# undef VERSION
 #endif
 
 /* Only compile multi-threading functions if we're in ZTS mode */

diff --git a/TSRM/configure.in b/TSRM/configure.in
index da5cb2953ccd00fb6eb4cd8457f1d99d402d5b9d..3034268db814957f8635ca439858c02b2429d4bc 100644 (file)
--- a/TSRM/configure.in
+++ b/TSRM/configure.in
@@ -4,7 +4,7 @@ dnl Minimalistic configure.in for TSRM.
 dnl
 
 AC_INIT(TSRM.c)
-AM_INIT_AUTOMAKE(TSRM, 1.0)
+AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
 AM_CONFIG_HEADER(tsrm_config.h)
 
 sinclude(tsrm.m4)

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 01397626a04000de8b4c263becd49805cdc474fb..d88fefb1b76bacf95e320797d3e6116e5a3f1315 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -3,10 +3,6 @@
 
 @TOP@
 
-/* these are defined by automake */
-#undef PACKAGE
-#undef VERSION
-
 #undef uint
 #undef ulong
 

diff --git a/Zend/configure.in b/Zend/configure.in
index 50ead57d930622ce42d6d29844dc59ed637822fb..ea2a24adf302a9bb81d9bb9c4f8b725b4535d82e 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -2,7 +2,7 @@ dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(zend.c)
-AM_INIT_AUTOMAKE(zend, 0.80A)
+AM_INIT_AUTOMAKE(zend, 0.80A, nodefine)
 AM_CONFIG_HEADER(zend_config.h)
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE