svn rev #21700: trunk/src/ plugins/locate/python/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21700
Commit By: raeburn
Log Message:
Build against Python 2.5 as well as 2.3.  Long term, should use python-config.


Changed Files:
U   trunk/src/configure.in
U   trunk/src/plugins/locate/python/Makefile.in
U   trunk/src/plugins/locate/python/py-locate.c
Modified: trunk/src/configure.in
===================================================================
--- trunk/src/configure.in	2009-01-05 17:59:59 UTC (rev 21699)
+++ trunk/src/configure.in	2009-01-05 18:19:32 UTC (rev 21700)
@@ -1024,7 +1024,12 @@
 AC_SUBST(ldap_plugin_dir)
 AC_SUBST(LDAP)
 
-AC_CHECK_HEADERS(Python.h python2.3/Python.h)
+dnl We really should look for and use python-config.
+PYTHON_LIB=
+AC_CHECK_HEADERS(Python.h python2.3/Python.h python2.5/Python.h)
+AC_CHECK_LIB(python2.3,main,[PYTHON_LIB=-lpython2.3],
+  AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5]))
+AC_SUBST(PYTHON_LIB)
 
 dnl
 dnl Kludge for simple server --- FIXME is this the best way to do this?

Modified: trunk/src/plugins/locate/python/Makefile.in
===================================================================
--- trunk/src/plugins/locate/python/Makefile.in	2009-01-05 17:59:59 UTC (rev 21699)
+++ trunk/src/plugins/locate/python/Makefile.in	2009-01-05 18:19:32 UTC (rev 21700)
@@ -11,7 +11,7 @@
 MODULE_INSTALL_DIR = $(KRB5_LIBKRB5_MODULE_DIR)
 
 SHLIB_EXPDEPS= $(KRB5_DEPLIB) $(SUPPORT_DEPLIB)
-SHLIB_EXPLIBS= -lpython2.3 $(KRB5_LIB) $(SUPPORT_LIB)
+SHLIB_EXPLIBS= @PYTHON_LIB@ $(KRB5_LIB) $(SUPPORT_LIB)
 
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)

Modified: trunk/src/plugins/locate/python/py-locate.c
===================================================================
--- trunk/src/plugins/locate/python/py-locate.c	2009-01-05 17:59:59 UTC (rev 21699)
+++ trunk/src/plugins/locate/python/py-locate.c	2009-01-05 18:19:32 UTC (rev 21700)
@@ -66,6 +66,8 @@
 #include <Python.h>
 #elif HAVE_PYTHON2_3_PYTHON_H
 #include <python2.3/Python.h>
+#elif HAVE_PYTHON2_5_PYTHON_H
+#include <python2.5/Python.h>
 #else
 #error "Where's the Python header file?"
 #endif