diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake --- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600 +++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700 @@ -13,13 +13,13 @@ SET(LIBOTR_FIND_QUIETLY TRUE) ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) -FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) +FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) -FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) +FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) -# Determine version information from libotr/version.h +# Determine version information from libotr3/version.h IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) - EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) + EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") # Check if version is at least 3.2.0 diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h --- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600 +++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700 @@ -26,7 +26,7 @@ */ extern "C"{ -#include "libotr/proto.h" +#include "libotr3/proto.h" } #include "kopetechatsession.h" diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h --- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600 +++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700 @@ -36,10 +36,10 @@ #include "authenticationwizard.h" extern "C" { -#include -#include -#include -#include +#include +#include +#include +#include } diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h --- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600 +++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700 @@ -32,11 +32,11 @@ #include extern "C" { -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include } class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject