--- CMakeLists.txt.orig	2019-06-06 18:43:20 UTC
+++ CMakeLists.txt
@@ -66,6 +66,10 @@ if(NOT DEFINED WEECHAT_LIBDIR)
   set(WEECHAT_LIBDIR ${LIBDIR}/${PROJECT_NAME})
 endif()
 
+if(NOT DEFINED LIBDATADIR)
+  set (LIBDATADIR ${CMAKE_INSTALL_PREFIX}/lib)
+endif()
+
 if(NOT DEFINED SHAREDIR)
   set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
 endif()
@@ -90,11 +94,13 @@ option(ENABLE_NLS           "Enable Native Language Su
 option(ENABLE_GNUTLS        "Enable SSLv3/TLS support"                    ON)
 option(ENABLE_LARGEFILE     "Enable Large File Support"                   ON)
 option(ENABLE_ALIAS         "Enable Alias plugin"                         ON)
+option(ENABLE_BACKTRACE     "Enable backtraces (via libexecinfo)"         ON)
 option(ENABLE_BUFLIST       "Enable Buflist plugin"                       ON)
 option(ENABLE_CHARSET       "Enable Charset plugin"                       ON)
 option(ENABLE_EXEC          "Enable Exec plugin"                          ON)
 option(ENABLE_FIFO          "Enable FIFO plugin"                          ON)
 option(ENABLE_FSET          "Enable Fast Set plugin"                      ON)
+option(ENABLE_ICONV         "Enable character conversion support"         ON)
 option(ENABLE_IRC           "Enable IRC plugin"                           ON)
 option(ENABLE_LOGGER        "Enable Logger plugin"                        ON)
 option(ENABLE_RELAY         "Enable Relay plugin"                         ON)
@@ -186,6 +192,7 @@ endif()
 # Check for libgcrypt
 find_package(GCRYPT REQUIRED)
 add_definitions(-DHAVE_GCRYPT)
+add_definitions(${GCRYPT_CFLAGS})
 list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
 
 # Check for GnuTLS
@@ -204,10 +211,12 @@ endif()
 find_package(ZLIB REQUIRED)
 add_definitions(-DHAVE_ZLIB)
 
-# Check for iconv
-find_package(Iconv)
-if(ICONV_FOUND)
-  add_definitions(-DHAVE_ICONV)
+if (ENABLE_ICONV)
+  # Check for iconv
+  find_package(Iconv)
+  if(ICONV_FOUND)
+    add_definitions(-DHAVE_ICONV)
+  endif()
 endif()
 
 # Check for CURL
@@ -266,7 +275,7 @@ set(exec_prefix "\${prefix}")
 string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
 set(includedir "\${prefix}/include")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDATADIR}/pkgconfig)
 
 # cygport file (used to build Cygwin packages)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)