From 25828bbf0ef07eb48a0f2cdcb9869c457b0054cc Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Fri, 24 Aug 2007 05:22:45 +0000
Subject: [PATCH] ICU-5527 improve tzcode compilation

X-SVN-Rev: 22504
---
 icu4c/source/config/mh-darwin         | 3 +++
 icu4c/source/tools/tzcode/Makefile.in | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin
index 35d3a53e9af..4c095a46aff 100644
--- a/icu4c/source/config/mh-darwin
+++ b/icu4c/source/config/mh-darwin
@@ -81,4 +81,7 @@ MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
 %.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
 	$(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
 
+# tzcode option
+TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
+
 ## End Darwin-specific setup
diff --git a/icu4c/source/tools/tzcode/Makefile.in b/icu4c/source/tools/tzcode/Makefile.in
index b9fbe174187..ce7c1a503a0 100644
--- a/icu4c/source/tools/tzcode/Makefile.in
+++ b/icu4c/source/tools/tzcode/Makefile.in
@@ -17,7 +17,7 @@ TZORIG=./tzorig
 TZORIG_TZDIR=./tzorig/tzdir
 TZORIG_ABS := $(shell pwd)/tzorig
 TZORIG_TZDIR_ABS := $(TZORIG_ABS)/tzdir
-TZORIG_OPTS := CFLAGS=-D_POSIX_C_SOURCE TZDIR=$(TZORIG_TZDIR_ABS)
+TZORIG_OPTS := CFLAGS="-D_POSIX_C_SOURCE $(TZORIG_EXTRA_CFLAGS)" TZDIR=$(TZORIG_TZDIR_ABS)
 
 
 ## Options for building zdumps
@@ -104,7 +104,7 @@ XDATA=zone.tab yearistype.sh leapseconds iso3166.tab
 ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo.txt
 
 zic:		$(OBJECTS) yearistype $(srcdir)/tz2icu.h
-		$(CC) $(CFLAGS) $(LFLAGS) -I$(srcdir) $(OBJECTS) $(LDLIBS) -o $@
+		$(CC) $(CFLAGS) $(TZORIG_EXTRA_CFLAGS) $(LFLAGS) -I$(srcdir) $(OBJECTS) $(LDLIBS) -o $@
 
 tz2icu:		$(srcdir)/tz2icu.cpp $(srcdir)/tz2icu.h
 		$(CXX) -W -Wall  -I$(srcdir) -I$(top_srcdir)/common -pedantic $(srcdir)/tz2icu.cpp -o $@