--- a/SUNWevolution.spec	Wed Oct 31 16:56:45 2007 +0000
+++ b/SUNWevolution.spec	Wed Oct 31 17:13:29 2007 +0000
@@ -115,7 +115,10 @@
 #       should be re-enabled once these issues are fixed
 export LD=/usr/ccs/bin/ld 
 export LDFLAGS="%{?arch_ldadd} -Wl,-z,ignore -L%{_libdir} -R%{_libdir}"
-export CFLAGS="%optflags -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib"
+export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib"
+%endif
 export RPM_OPT_FLAGS="$CFLAGS"
 export PERL=/usr/perl5/bin/perl
 export PKG_CONFIG_PATH=%{_pkg_config_path}:%{_builddir}/%name-%version/evolution-%{evolution.version}
@@ -288,6 +291,8 @@
 
 %changelog
 * Wed Oct 31 2006 - [email protected]
+- Put the /usr/gnu references inside '%if %option_with_gnu_iconv' test.
+* Wed Oct 31 2006 - [email protected]
 - Remove %{_libexecdir}/evolution/%{evolution.major_version}/evolution-backup
   as it is not in the 2.21.1 tarball.
 * Mon Oct 22 2006 - [email protected]