From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 8 Nov 2011 00:29:57 +0000 (-0500)
Subject: fix build warnings when using --with-arch
X-Git-Tag: root-2~4
X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=commitdiff_plain;h=d1d3534416ea209bf4dc5069127761bf840f0ce4

fix build warnings when using --with-arch

Latest configure code will setup FC_ARCHITECTURE directly rather than
going through ARCHITECTURE, so update fcarch.h accordingly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/src/fcarch.h b/src/fcarch.h
index 0c8cd05..9cabf04 100644
--- a/src/fcarch.h
+++ b/src/fcarch.h
@@ -62,9 +62,8 @@
 # define FC_ARCH_SIZE_ALIGN "64"
 #endif
 
-#ifdef ARCHITECTURE
-# define ARCHITECTURE FC_ARCHITECTURE
-#else
+/* config.h might override this */
+#ifndef FC_ARCHITECTURE
 # define FC_ARCHITECTURE FC_ARCH_ENDIAN FC_ARCH_SIZE_ALIGN
 #endif