adjust to not use cpp in modules used by configure

3 files changed, 19 insertions, 10 deletions

diff --git a/Git/Types.hs b/Git/Types.hs
index 950fe4b00..838c9e0e7 100644
--- a/Git/Types.hs
+++ b/Git/Types.hs
@@ -11,6 +11,7 @@ import Network.URI
 import qualified Data.Map as M
 import System.Posix.Types
 import Utility.SafeCommand
+import Utility.URI ()
 
 {- Support repositories on local disk, and repositories accessed via an URL.
  -
diff --git a/Utility/Network.hs b/Utility/Network.hs
index 015c004d7..62523c9e9 100644
--- a/Utility/Network.hs
+++ b/Utility/Network.hs
@@ -5,8 +5,6 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE CPP #-}
-
 module Utility.Network where
 
 import Utility.Process
@@ -14,14 +12,6 @@ import Utility.Exception
 
 import Control.Applicative
 
--- Old versions of network lacked an Ord for URI
-#if ! MIN_VERSION_network(2,4,0)
-import Network.URI
-
-instance Ord URI where
-	a `compare` b = show a `compare` show b
-#endif
-
 {- Haskell lacks uname(2) bindings, except in the
  - Bindings.Uname addon. Rather than depend on that,
  - use uname -n when available. -}
diff --git a/Utility/URI.hs b/Utility/URI.hs
new file mode 100644
index 000000000..39c2f2289
--- /dev/null
+++ b/Utility/URI.hs
@@ -0,0 +1,18 @@
+{- Network.URI
+ -
+ - Copyright 2014 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+{-# LANGUAGE CPP #-}
+
+module Utility.URI where
+
+-- Old versions of network lacked an Ord for URI
+#if ! MIN_VERSION_network(2,4,0)
+import Network.URI
+
+instance Ord URI where
+	a `compare` b = show a `compare` show b
+#endif