From: David Hedbor <neotron@php.net>
Date: Mon, 5 Jun 2000 21:05:07 +0000 (+0000)
Subject: Added a new user-definable include variable, PRE_INCLUDES. It works
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff8a716efe17e87ac381d9931a685ff275ac0b2c;p=php

Added a new user-definable include variable, PRE_INCLUDES. It works
like EXTRA_INCLUDES but is added before the global INCLUDES variable.
#
# This was needed for the roxen SAPI module, which requires the PHP4
# include dirs to be after the Pike include dirs. I can't make the
# Pike include dir global though, since Pike includes then conflict
# with PHP4 includes in the rest of the compile.
---

diff --git a/build/rules.mk b/build/rules.mk
index 6433867d9b..fa67a10bf2 100644
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -26,14 +26,14 @@
 
 include $(top_builddir)/config_vars.mk
 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+COMPILE = $(CC) $(DEFS) $(PRE_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS)  $(PRE_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644
-SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@
+SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS)  $(PRE_INCLUDES)  $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir)
 
 moduledir    = $(EXTENSION_DIR)
@@ -88,7 +88,7 @@ install-p: $(targets) $(install_targets)
 distclean-p depend-p clean-p:
 
 depend: depend-recursive
-	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > $(builddir)/.deps
+	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP)  $(PRE_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) *.c > $(builddir)/.deps
 
 clean: clean-recursive clean-x