summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul W. Frields <stickster@gmail.com>2012-03-02 22:29:48 -0500
committerPaul W. Frields <stickster@gmail.com>2012-03-02 23:18:13 -0500
commitd760ac2b33f3d9b08fe1a42afe7d86d83205e3f8 (patch)
tree8ac6cba423e4cd8b321457ab1071c39c42550663
parent29637ceae35271c44a44a671b86caa149ef1880e (diff)
downloadirssi-python-d760ac2b33f3d9b08fe1a42afe7d86d83205e3f8.tar.gz
irssi-python-d760ac2b33f3d9b08fe1a42afe7d86d83205e3f8.tar.xz
irssi-python-d760ac2b33f3d9b08fe1a42afe7d86d83205e3f8.zip
Fix build for irssi-0.8.15 on Fedora 16
-rw-r--r--configure.in18
-rw-r--r--src/Makefile.am6
-rw-r--r--src/objects/statusbar-item-object.h2
-rw-r--r--src/pyirssi.h2
4 files changed, 24 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index e49f64d..628a865 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,22 @@ AC_PROG_CC
AC_PROG_MAKE_SET
# Checks for libraries.
-AC_PYTHON_DEVEL([>= '2.4'])
+AM_PATH_PYTHON
+AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
+AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
+AS_IF([test -z "$PYTHON_INCLUDE"], [
+ AS_IF([test -z "$PYTHON_CONFIG"], [
+ AC_PATH_PROGS([PYTHON_CONFIG],
+ [python$PYTHON_VERSION-config python-config],
+ [no],
+ [`dirname $PYTHON`])
+ AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON.])])
+ ])
+ AC_MSG_CHECKING([python include flags])
+ PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
+ AC_MSG_RESULT([$PYTHON_INCLUDE])
+])
+#AC_PYTHON_DEVEL
AM_PATH_GLIB_2_0(2.0.0)
# Checks for header files.
@@ -51,6 +66,7 @@ AC_SUBST([IRSSI_DIST])
IRSSI_PYTHON_INCLUDES="-I${IRSSI_DIST} -I${IRSSI_DIST}/src -I${IRSSI_DIST}/src/fe-common/core \
-I${IRSSI_DIST}/src/core -I${IRSSI_DIST}/src/fe-text -I${IRSSI_DIST}/src/irc \
-I${IRSSI_DIST}/src/irc/core -I${IRSSI_DIST}/src/irc/dcc -I${IRSSI_DIST}/src/irc/notifylist \
+-I${PYTHON_INCLUDE} \
${PYTHON_CPPFLAGS} ${GLIB_CFLAGS}"
AC_SUBST([IRSSI_PYTHON_INCLUDES])
diff --git a/src/Makefile.am b/src/Makefile.am
index d5356a7..1034592 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,10 @@ EXTRA_DIST = $(wrappers_DATA)
SUBDIRS = objects
-signalmap:
+signalmap: pysigmap.h
+pysigmap.h:
awk -f sig2code.awk $(IRSSI_DIST)/docs/signals.txt > pysigmap.h
-constants:
+constants: pyconstants.c
+pyconstants.c:
awk -f constants.awk constants.txt > pyconstants.c
diff --git a/src/objects/statusbar-item-object.h b/src/objects/statusbar-item-object.h
index 19243f4..e23a7ce 100644
--- a/src/objects/statusbar-item-object.h
+++ b/src/objects/statusbar-item-object.h
@@ -3,6 +3,8 @@
#include <Python.h>
#include "base-objects.h"
+#include "pyirssi.h"
+#include "statusbar.h"
/* forward */
struct SBAR_ITEM_REC;
diff --git a/src/pyirssi.h b/src/pyirssi.h
index 2dc4e45..d3f4b34 100644
--- a/src/pyirssi.h
+++ b/src/pyirssi.h
@@ -8,7 +8,7 @@
#include "commands.h"
#include "settings.h"
#include "printtext.h"
-#include "statusbar.h"
+#include "statusbar-item.h"
#include "mainwindows.h"
#include "window-items.h"
#include "window-activity.h"