Merge pull request #128 from Deiz/optional-webkit

Respect WITH_WEBKIT when defining HAVE_WEBKIT

diff --combined CMakeLists.txt
index 3028a42,a1f79a0..1a22fac
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -240,7 -240,11 +240,11 @@@ if (USE_QT5
                  )
              endif()
          endif()
-         add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat")
+ 
+         if (WITH_WEBKIT AND Qt5WebKitWidgets_FOUND)
+             set(HAVE_WEBKIT true)
+         endif()
+         add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" HAVE_WEBKIT "Support showing previews for URLs in chat")
  
          # KDE Frameworks
          ################
@@@ -570,10 -574,10 +574,10 @@@ git_describe(GIT_DESCRIBE --long
  # enviroment
  if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
    if (DEFINED ENV{GIT_HEAD})
 -      set(GIT_HEAD ${GIT_HEAD})
 +      set(GIT_HEAD $ENV{GIT_HEAD})
    endif ()
    if (DEFINED ENV{GIT_DESCRIBE})
 -     set(GIT_DESCRIBE ${GIT_DESCRIBE})
 +     set(GIT_DESCRIBE $ENV{GIT_DESCRIBE})
    endif()
  endif()