Rename haskell variables to enable shm and ghci-ng

`haskell-enable-shm-support`
`haskell-enable-ghci-ng-support`

contrib/lang/haskell/README.md

@@ -97,7 +97,7 @@ Follow the instructions to install [ghci-ng][] (remember to add `:set +c` in `~/
 next set the layer variable:
 ```elisp
 ;; List of configuration layers to load.
-dotspacemacs-configuration-layers '(company-mode (haskell :variables haskell-ghci-ng-support t) git)
+dotspacemacs-configuration-layers '(company-mode (haskell :variables haskell-enable-ghci-ng-support t) git)
 ```
 
 Once ghci-ng is enabled, two of the old keybindings are overriden with improved versions from ghci-ng, and a new keybinding available: 
@@ -113,7 +113,7 @@ Once ghci-ng is enabled, two of the old keybindings are overriden with improved
 To enable shm, run `cabal install structured-haskell-mode` and set the layer variable:
 ```elisp
 ;; List of configuration layers to load.
-dotspacemacs-configuration-layers '(company-mode (haskell :variables haskell-shm-support t) git)
+dotspacemacs-configuration-layers '(company-mode (haskell :variables haskell-enable-shm-support t) git)
 ```
 
 ## Key bindings

contrib/lang/haskell/config.el

@@ -10,8 +10,8 @@
 ;;; License: GPLv3
 
 ;; Variables
-(defvar haskell-ghci-ng-support nil
+(defvar haskell-enable-ghci-ng-support nil
   "If non-nil ghci-ng support is enabled")
 
-(defvar haskell-shm-support nil
+(defvar haskell-enable-shm-support nil
   "If non-nil structured-haskell-mode support is enabled")

contrib/lang/haskell/packages.el

@@ -28,7 +28,7 @@
 (defun haskell/init-shm ()
   (use-package shm
     :defer t
-    :if haskell-shm-support
+    :if haskell-enable-shm-support
     :init
     (add-hook 'haskell-mode-hook 'structured-haskell-mode)
     :config
@@ -151,7 +151,7 @@
       (defun haskell-hook ()
         (ghc-init)
         ;; Use advanced indention
-        (if (not haskell-shm-support)
+        (if (not haskell-enable-shm-support)
             (turn-on-haskell-indentation)
           )
 
@@ -187,7 +187,7 @@
             ))
         )
 
-      (if haskell-ghci-ng-support
+      (if haskell-enable-ghci-ng-support
           (ghci-ng-setup)))))
 
 (defun haskell/init-company-ghc ()
@@ -201,7 +201,7 @@
   (use-package hi2
     :diminish hi2-mode
     :commands turn-on-hi2
-    :if (not haskell-shm-support)
+    :if (not haskell-enable-shm-support)
     :init
     (add-hook 'haskell-mode-hook 'turn-on-hi2)
     :config