From 43447f0f95d15dc659537f49ea88e76c62504b7f Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Mon, 15 Nov 2010 19:51:28 +0000
Subject: [PATCH] Fixed missing architecture flags in OS X build (STR #2303)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@7847 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES      | 1 +
 configure.in | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 0158ed352..7fb5eafb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ CHANGES IN FLTK 1.1.11
 
 	- Documentation fixes (STR #2410)
 	- Fixed mouse wheel related crash in GLUT emulation (STR #2381)
+	- Fixed missing architecture flags in OS X build (STR #2303)
 
 CHANGES IN FLTK 1.1.10
 
diff --git a/configure.in b/configure.in
index 9157c2e69..ee6d7f97b 100644
--- a/configure.in
+++ b/configure.in
@@ -92,8 +92,10 @@ case $uname in
         d_rev=`echo $d_ver_rev | sed -e 's/[[0-9]][[0-9]]*\.//'`
         if test $d_ver -gt 10 -o $d_ver -eq 10 -a $d_rev -ge 6; then
             CFLAGS="$CFLAGS -arch i386"
+            CXXFLAGS="$CPPFLAGS -arch i386"
             CXXFLAGS="$CXXFLAGS -arch i386"
             LDFLAGS="$LDFLAGS -arch i386"
+            DSOFLAGS="$DSOFLAGS -arch i386"
         fi
         ;;
 esac