]> git.wh0rd.org - fontconfig.git/commitdiff
fix build warnings when using --with-arch
authorMike Frysinger <vapier@gentoo.org>
Tue, 8 Nov 2011 00:29:57 +0000 (19:29 -0500)
committerMike Frysinger <vapier@gentoo.org>
Tue, 8 Nov 2011 00:31:14 +0000 (19:31 -0500)
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>
src/fcarch.h

index 0c8cd053ff6dddd202c341045f38c28ac350e81d..9cabf0450d2e1e55c19ea18b6d07397b04b646dd 100644 (file)
@@ -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