From 0eb3d45582c6c7f8187a5adc8a61fcfa2bef46c6 Mon Sep 17 00:00:00 2001
From: Emmanuel Bouthenot <kolter@openics.org>
Date: Sun, 29 May 2005 15:15:12 +0000
Subject: [PATCH] Fix python library detection on FreeBSD

---
 configure.in         | 16 ++++++++--------
 weechat/configure.in | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/configure.in b/configure.in
index 5e83d2017..107dd5cb5 100644
--- a/configure.in
+++ b/configure.in
@@ -138,7 +138,7 @@ PLUGINS_LIBS=
 if test "x$enable_perl" = "xyes" ; then
     enable_plugins="yes"
     
-    AC_PATH_PROG(PERL, perl)
+    AC_PATH_PROG(PERL, perl perl5)
     if test -z $PERL ; then
         AC_MSG_ERROR([
 *** Perl must be installed on your system
@@ -181,7 +181,7 @@ fi
 if test "x$enable_python" = "xyes" ; then
     enable_plugins="yes"
     
-    AC_PATH_PROG(PYTHON, python)
+    AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2)
     if test -z $PYTHON ; then
         AC_MSG_ERROR([
 *** Python must be installed on your system
@@ -191,11 +191,13 @@ if test "x$enable_python" = "xyes" ; then
 *** it with your software package manager.])
     fi
     
-    PYTHON_INCLUDE=`$PYTHON -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[[:3]])'`
+    PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
+    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[:3]]'`
+    PYTHON_INCLUDE="$PYTHON_SYSPREFIX/include/python$PYTHON_VERSION"
     
     AC_MSG_CHECKING(for Python header files)
     if test -r "$PYTHON_INCLUDE/Python.h"; then
-        PYTHON_CFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print ' -I' + distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
+        PYTHON_CFLAGS=-I`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
     else
         AC_MSG_ERROR([
 *** Python header files couldn't be found in your system.
@@ -203,13 +205,11 @@ if test "x$enable_python" = "xyes" ; then
     fi
     AC_MSG_RESULT(found)
     
-    PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
-    PYTHON_LIB=`$PYTHON -c 'import sys; print "%s/lib/python%s/config" % (sys.prefix, sys.version[[:3]])'`
-    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[0:3]]'`
+    PYTHON_LIB="$PYTHON_SYSPREFIX/lib/python$PYTHON_VERSION/config"
     
     AC_MSG_CHECKING(for Python library)
     if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -o -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-        PYTHON_LFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print string.join(distutils.sysconfig.get_config_vars('LINKFORSHARED', 'BLDLIBRARY', 'SHLIBS'))"`
+        PYTHON_LFLAGS="-lpython$PYTHON_VERSION -lpthread -lutil"
     else
         AC_MSG_ERROR([
 *** Python library couldn't be found in your system.            
diff --git a/weechat/configure.in b/weechat/configure.in
index 5e83d2017..107dd5cb5 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -138,7 +138,7 @@ PLUGINS_LIBS=
 if test "x$enable_perl" = "xyes" ; then
     enable_plugins="yes"
     
-    AC_PATH_PROG(PERL, perl)
+    AC_PATH_PROG(PERL, perl perl5)
     if test -z $PERL ; then
         AC_MSG_ERROR([
 *** Perl must be installed on your system
@@ -181,7 +181,7 @@ fi
 if test "x$enable_python" = "xyes" ; then
     enable_plugins="yes"
     
-    AC_PATH_PROG(PYTHON, python)
+    AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2)
     if test -z $PYTHON ; then
         AC_MSG_ERROR([
 *** Python must be installed on your system
@@ -191,11 +191,13 @@ if test "x$enable_python" = "xyes" ; then
 *** it with your software package manager.])
     fi
     
-    PYTHON_INCLUDE=`$PYTHON -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[[:3]])'`
+    PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
+    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[:3]]'`
+    PYTHON_INCLUDE="$PYTHON_SYSPREFIX/include/python$PYTHON_VERSION"
     
     AC_MSG_CHECKING(for Python header files)
     if test -r "$PYTHON_INCLUDE/Python.h"; then
-        PYTHON_CFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print ' -I' + distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
+        PYTHON_CFLAGS=-I`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
     else
         AC_MSG_ERROR([
 *** Python header files couldn't be found in your system.
@@ -203,13 +205,11 @@ if test "x$enable_python" = "xyes" ; then
     fi
     AC_MSG_RESULT(found)
     
-    PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
-    PYTHON_LIB=`$PYTHON -c 'import sys; print "%s/lib/python%s/config" % (sys.prefix, sys.version[[:3]])'`
-    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[0:3]]'`
+    PYTHON_LIB="$PYTHON_SYSPREFIX/lib/python$PYTHON_VERSION/config"
     
     AC_MSG_CHECKING(for Python library)
     if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -o -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-        PYTHON_LFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print string.join(distutils.sysconfig.get_config_vars('LINKFORSHARED', 'BLDLIBRARY', 'SHLIBS'))"`
+        PYTHON_LFLAGS="-lpython$PYTHON_VERSION -lpthread -lutil"
     else
         AC_MSG_ERROR([
 *** Python library couldn't be found in your system.