From: Sascha Schumann <sas@php.net>
Date: Sat, 2 Dec 2000 13:27:07 +0000 (+0000)
Subject: Use the hardly-documented third parameter of AM_INIT_AUTOMAKE to suppress
X-Git-Tag: php-4.0.5RC1~1048
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af97475e93f3b917531616c625183f1926c86b21;p=php

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 e060cd238b..fa789b6732 100644
--- 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 da5cb2953c..3034268db8 100644
--- 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 01397626a0..d88fefb1b7 100644
--- 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 50ead57d93..ea2a24adf3 100644
--- 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