-DUTF8 flag with -DUSE_UTF8

XMonad/Util/Font.hsc

@@ -43,7 +43,7 @@ import Graphics.X11.Xft
 import Graphics.X11.Xrender
 #endif
 
-#if defined XFT || defined UTF8
+#if defined XFT || defined USE_UTF8
 import Codec.Binary.UTF8.String (encodeString, decodeString)
 #endif
 
@@ -103,7 +103,7 @@ initXMF s =
         return (Xft xftdraw)
   else
 #endif
-#ifdef UTF8
+#ifdef USE_UTF8
       fmap Utf8 $ initUtf8Font s
 #else
       fmap Core $ initCoreFont s

XMonad/Util/XSelection.hs

@@ -30,7 +30,7 @@ import Data.Maybe (fromMaybe)
 import XMonad
 import XMonad.Util.Run (safeSpawn, unsafeSpawn)
 
-#ifdef UTF8
+#ifdef USE_UTF8
 import Codec.Binary.UTF8.String (decode)
 #else
 import Data.Bits (shiftL, (.&.), (.|.))

xmonad-contrib.cabal

@@ -55,7 +55,7 @@ library
     if flag(with_utf8)
         build-depends: utf8-string
         extensions: ForeignFunctionInterface
-        cpp-options: -DUTF8
+        cpp-options: -DUSE_UTF8
 
     build-depends:      mtl, unix, X11>=1.4.3, xmonad>=0.8, xmonad<0.9
     ghc-options:        -Wall