From 80715bd126925c73cc2cb79e18c641506537566a Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Fri, 8 Aug 2008 00:11:58 +0000 Subject: Added Text.Pandoc.UTF8 as a backup for when utf8-string is not present. + Added Text.Pandoc.UTF8 + Changed flag name from utf8 to utf8-string + Changed CPP MACRO from _UTF8 to _UTF8STRING + Import IO functions from Text.Pandoc.UTF8 when utf8-string not available. + Removed utf8-string dependency from debian/control. + Removed pandoc.cabal.ghc66; we no longer support GHC 6.6 + Modified INSTALL instructions git-svn-id: https://pandoc.googlecode.com/svn/trunk@1383 788f1e2b-df1e-0410-8736-df70ead52e1b --- pandoc.cabal | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'pandoc.cabal') diff --git a/pandoc.cabal b/pandoc.cabal index 604fc0a3b..efadb6b6a 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -64,8 +64,8 @@ Flag executable Flag library Description: Build the pandoc library. Default: True -Flag utf8 - Description: Compile in support for UTF-8 input and output. +Flag utf8-string + Description: Use utf8-string library for UTF-8 I/O. Default: True Flag citeproc Description: Compile in support for citeproc-hs bibliographic formatting. @@ -79,9 +79,11 @@ Library if flag(highlighting) Build-depends: highlighting-kate cpp-options: -D_HIGHLIGHTING - if flag(utf8) + if flag(utf8-string) Build-depends: utf8-string - cpp-options: -D_UTF8 + cpp-options: -D_UTF8STRING + else + Other-Modules: Text.Pandoc.UTF8 if flag(citeproc) Build-depends: citeproc-hs cpp-options: -D_CITEPROC @@ -141,8 +143,11 @@ Executable pandoc if flag(highlighting) cpp-options: -D_HIGHLIGHTING - if flag(utf8) - cpp-options: -D_UTF8 + if flag(utf8-string) + Build-depends: utf8-string + cpp-options: -D_UTF8STRING + else + Other-Modules: Text.Pandoc.UTF8 if flag(citeproc) Build-depends: citeproc-hs cpp-options: -D_CITEPROC -- cgit v1.2.3