From 553d91a15fad4fbf58f6c8e4de8d8ed10c6603cc Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Sat, 2 May 2009 02:37:38 +0000
Subject: Made pandoc -v more explicit about compiler options.

Resolves Issue #139.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1574 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 src/pandoc.hs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/pandoc.hs b/src/pandoc.hs
index b4f54b7c1..c57cf8b5a 100644
--- a/src/pandoc.hs
+++ b/src/pandoc.hs
@@ -33,7 +33,9 @@ module Main where
 import Text.Pandoc
 import Text.Pandoc.ODT
 import Text.Pandoc.Shared ( HTMLMathMethod (..), tabFilter, ObfuscationMethod (..) )
+#ifdef _HIGHLIGHTING
 import Text.Pandoc.Highlighting ( languages )
+#endif
 import System.Environment ( getArgs, getProgName, getEnvironment )
 import System.Exit ( exitWith, ExitCode (..) )
 import System.FilePath
@@ -59,18 +61,13 @@ copyrightMessage = "\nCopyright (C) 2006-8 John MacFarlane\n" ++
 compileInfo :: String
 compileInfo =
 #ifdef _CITEPROC
-  " +citeproc" ++
-#else
-  " -citeproc" ++
+  "\nCompiled with citeproc support." ++
 #endif
 #ifdef _HIGHLIGHTING
-  " +highlighting" ++
-#else
-  " -highlighting" ++
+   "\nCompiled with syntax highlighting support for:\n" ++
+       wrapWords 78 languages ++
 #endif
-  if null languages
-     then "\n"
-     else "\nCompiled with syntax highlighting support for:\n" ++ wrapWords 78 languages
+   ""
 
 -- | Converts a list of strings into a single string with the items printed as
 -- comma separated words in lines with a maximum line length.
-- 
cgit v1.2.3