From commits-return-7745-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Fri Jan 6 21:44:29 2012 Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11194BF59 for ; Fri, 6 Jan 2012 21:44:29 +0000 (UTC) Received: (qmail 21878 invoked by uid 500); 6 Jan 2012 21:44:28 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 21782 invoked by uid 500); 6 Jan 2012 21:44:28 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 21775 invoked by uid 99); 6 Jan 2012 21:44:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 21:44:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 21:44:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4040853060; Fri, 6 Jan 2012 21:44:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randall@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Use ICU_CPPFLAGS instead of _CFLAGS Message-Id: <20120106214403.4040853060@tyr.zones.apache.org> Date: Fri, 6 Jan 2012 21:44:03 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/1.2.x 0f13ff553 -> 312c7f402 Use ICU_CPPFLAGS instead of _CFLAGS This removes the need for c4f6ff9c6cf5512546d5799f05dd445a4da979b3 which was made in response to -ansi coming from icu-config on my system. Instead, it's more sensible to use the preprocessor flags from icu-config which provides the -I header locations and -D definitions but doesn't add a bunch of excessive warning flags or ansi conformance. This reverts commit c4f6ff9c6cf5512546d5799f05dd445a4da979b3. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/312c7f40 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/312c7f40 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/312c7f40 Branch: refs/heads/1.2.x Commit: 312c7f402b4bef13a0feb31140abb40ee5aa2f47 Parents: 0f13ff5 Author: Randall Leeds Authored: Tue Jan 3 14:14:55 2012 -0500 Committer: Randall Leeds Committed: Fri Jan 6 13:43:38 2012 -0800 ---------------------------------------------------------------------- configure.ac | 3 ++- src/couchdb/priv/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/312c7f40/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index eb763c0..d4de2d1 100644 --- a/configure.ac +++ b/configure.ac @@ -323,7 +323,7 @@ CPPFLAGS="$OLD_CPPFLAGS" AC_ARG_WITH([win32-icu-binaries], [AC_HELP_STRING([--with-win32-icu-binaries=PATH], [set PATH to the Win32 native ICU binaries directory])], [ - ICU_CFLAGS="-I$withval/include" + ICU_CPPFLAGS="-I$withval/include" ICU_LIBS="-L$withval/lib -licuuc -licudt -licuin" ICU_BIN=$withval/bin ], [ @@ -332,6 +332,7 @@ AC_ARG_WITH([win32-icu-binaries], [AC_HELP_STRING([--with-win32-icu-binaries=PAT ]) AC_SUBST(ICU_CFLAGS) +AC_SUBST(ICU_CPPFLAGS) AC_SUBST(ICU_LIBS) AC_SUBST(ICU_BIN) http://git-wip-us.apache.org/repos/asf/couchdb/blob/312c7f40/src/couchdb/priv/Makefile.am ---------------------------------------------------------------------- diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am index 1080b01..02f7a7f 100644 --- a/src/couchdb/priv/Makefile.am +++ b/src/couchdb/priv/Makefile.am @@ -32,7 +32,7 @@ couchprivlib_LTLIBRARIES = couch_icu_driver.la if USE_EJSON_COMPARE_NIF couchprivlib_LTLIBRARIES += couch_ejson_compare.la couch_ejson_compare_la_SOURCES = couch_ejson_compare/couch_ejson_compare.c -couch_ejson_compare_la_CFLAGS = -D_BSD_SOURCE $(ICU_CFLAGS) $(ERLANG_FLAGS) +couch_ejson_compare_la_CPPFLAGS = -D_BSD_SOURCE $(ICU_CPPFLAGS) $(ERLANG_FLAGS) couch_ejson_compare_la_LDFLAGS = -module -avoid-version couch_ejson_compare_la_LIBADD = $(ICU_LIBS) if WINDOWS @@ -41,7 +41,7 @@ endif endif couch_icu_driver_la_SOURCES = icu_driver/couch_icu_driver.c couch_icu_driver_la_LDFLAGS = -module -avoid-version -couch_icu_driver_la_CFLAGS = $(ICU_CFLAGS) $(ERLANG_FLAGS) +couch_icu_driver_la_CPPFLAGS = $(ICU_CPPFLAGS) $(ERLANG_FLAGS) couch_icu_driver_la_LIBADD = $(ICU_LIBS) if WINDOWS