[Pkg-privacy-commits] [irssi-plugin-otr] 45/267: Correctly detect irssi header and small format change. Thanks to netzwurm.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit e9959622cada37ac491bd11811c24acd84b733a4
Author: Uli Meis <a.sporto+bee at gmail.com>
Date:   Mon Feb 2 16:51:09 2009 +0100

    Correctly detect irssi header and small format change. Thanks to netzwurm.
---
 CMakeLists.txt | 7 +++++--
 formats.txt    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cad74b8..9207c26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,9 @@ SET(IRSSIOTR_INCLUDE_DIRS
   ${GLIB_INCLUDE_DIRS} 
   ${LIBOTR_INCLUDE_DIRS})
 
+SET(CMAKE_REQUIRED_INCLUDES ${IRSSIOTR_INCLUDE_DIRS})
+SET(CMAKE_REQUIRED_DEFINITIONS -DHAVE_CONFIG_H ${LIBGCRYPT_CFLAGS})
+
 # irssi public headers
 
 FIND_PATH(IRSSI_INCLUDE_DIR NAMES irssi/src/core/module.h)
@@ -124,6 +127,8 @@ ELSE(NOT IRSSI_INCLUDE_DIR)
     ${PROJECT_BINARY_DIR}/irssi-headers
     ${PROJECT_SOURCE_DIR}/irssi-headers)
 
+  SET(CMAKE_REQUIRED_INCLUDES ${IRSSIOTR_INCLUDE_DIRS})
+
   # irssi statusbar header
 
   CHECK_INCLUDE_FILES("glib.h;common.h;fe-text/statusbar-item.h" HAVE_IRSSISBAR_H)
@@ -163,8 +168,6 @@ ELSE(NOT XCHAT_INCLUDE_DIR)
 ENDIF(NOT XCHAT_INCLUDE_DIR)
 
 include_directories(${IRSSIOTR_INCLUDE_DIRS})
-SET(CMAKE_REQUIRED_INCLUDES ${IRSSIOTR_INCLUDE_DIRS})
-SET(CMAKE_REQUIRED_DEFINITIONS -DHAVE_CONFIG_H ${LIBGCRYPT_CFLAGS})
 
 # gregex.h 
 # available since 2.13 AFAIK
diff --git a/formats.txt b/formats.txt
index 593c3ca..9c3a7ee 100644
--- a/formats.txt
+++ b/formats.txt
@@ -6,7 +6,7 @@ kg_aborted_dir	Key generation for %s: aborted, failed creating directory %s: %s
 kg_mkdir	created directory %s
 kg_pipe	Key generation for %s: error creating pipe: %s
 kg_fork	Key generation for %s: fork() error: %s
-kg_initiated	Key generation for %s: initiated. This might take several minutes or on some systems even an hour. If you wanna check that something is happening, see if there are two irssi processes.
+kg_initiated	Key generation for %s: initiated. This might take several minutes or on some systems even an hour. If you wanna check that something is happening, see if there are two processes of your IRC client.
 kg_exited	Key generation for %s: child terminated for unknown reason
 kg_exitsig	Key generation for %s: child was killed by signal %s
 kg_pollerr	Key generation for %s: error poll()ing child: %s

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git