[Pkg-privacy-commits] [irssi-plugin-otr] 07/267: formats array now NULL terminated, cmake now searchs for python executable.

[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 0e36f112eac0b7a13e01808558c869e6471ab12c
Author: Uli Meis <a.sporto+bee at gmail.com>
Date:   Wed Jun 4 00:57:11 2008 +0200

    formats array now NULL terminated, cmake now searchs for python executable.
    
    Let's hope that will solve the segfault on freebsd...
---
 CMakeLists.txt | 8 ++++++++
 makeformats.py | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7b6100..69c7eae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,13 @@ INCLUDE(cmake-extensions/cscope.cmake)
 FIND_PACKAGE(PkgConfig REQUIRED)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 
+# Python
+
+FIND_PACKAGE(PythonInterp)
+IF(NOT PYTHON_EXECUTABLE)
+  MESSAGE(FATAL_ERROR "Couldn't find a python interpreter")
+ENDIF(NOT PYTHON_EXECUTABLE)
+
 # LIBOTR
 
 FIND_PACKAGE(LibOTR REQUIRED)
@@ -83,6 +90,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H -Wall -g)
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/otr-formats.c 
   DEPENDS makeformats.py formats.txt README
   COMMAND 
+  ${PYTHON_EXECUTABLE}
   ${PROJECT_SOURCE_DIR}/makeformats.py 
   ${PROJECT_SOURCE_DIR}/formats.txt
   ${PROJECT_SOURCE_DIR}/README
diff --git a/makeformats.py b/makeformats.py
index cb72907..a0a3ccf 100755
--- a/makeformats.py
+++ b/makeformats.py
@@ -92,7 +92,8 @@ hdr.write("""
 extern FORMAT_REC formats[];
 """)
 
-src.write("""
+src.write(""",
+{ NULL, NULL, 0 }
 };
 """)
 

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