Difference for ./acinclude.m4 from version 1.7 to 1.8


version 1.7 version 1.8
Line 5
 
Line 5
  PY_LIBS=""   PY_LIBS=""
  PY_INCLUDES=""   PY_INCLUDES=""
  dir=""   dir=""
    if test "x$PYTHON_HOME" != "x"; then
    for dir in $PYTHON_HOME/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
    AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
    if test "x$cf_have_python_h" != "x" ; then
    PY_INCLUDES="-I$dir"
    break
    fi
    done
    PYTHON_SEARCH=$PYTHON
    else
  AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])   AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])
  if test "x$cf_have_python_h" = "x"  ; then   if test "x$cf_have_python_h" = "x"  ; then
  for dir in /usr{,/local}/include/python{,2.4,2.3,2.2,2.1,2.0} ; do   for dir in  /usr{,/local}/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
  AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])   AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
  if test "x$cf_have_python_h" != "x" ; then   if test "x$cf_have_python_h" != "x" ; then
  PY_INCLUDES="-I$dir"   PY_INCLUDES="-I$dir"
Line 17
 
Line 27
  else   else
  PY_INCLUDES=""   PY_INCLUDES=""
  fi   fi
    fi
   
  if test "x$cf_have_python_h" = "xyes" ; then   if test "x$cf_have_python_h" = "xyes" ; then
  PYTHON_LIB=""   PYTHON_LIB=""
    if test "x$PYTHON_HOME" != "x"; then
    # I am going of how manually compiled python installed on
    # my system.  We can't use AC_CHECK_LIB, because that will
    # find the one in the stanard location, which is what we
    # want to avoid.
    python=`echo $dir | awk -F/ '{print $NF}'`;
    AC_MSG_CHECKING([For python lib in various places])
    if test -f $PYTHON_HOME/lib/lib$python.so ; then
    # Hopefully -R is a universal option
    AC_MSG_RESULT([found in $PYTHON_HOME/lib/])
    if test -n "$hardcode_libdir_flag_spec" ; then
    oldlibdir=$libdir
    libdir="$PYTHON_HOME/lib/"
    rpath=`eval echo $hardcode_libdir_flag_spec`
    PYTHON_LIB="$rpath -L$PYTHON_HOME/lib/ -l$python"
    echo "rpath=$rpath"
    libdir=$oldlibdir
    else
    PYTHON_LIB="-L$PYTHON_HOME/lib/ -l$python"
    fi
   
                 for lib in python{,2.4,2.3,2.2,2.1,2.0} ; do   elif test -f $PYTHON_HOME/lib/$python/lib$python.a ; then
    PYTHON_LIB="$PYTHON_HOME/lib/$python/lib$python.a"
    AC_MSG_RESULT([found in $PYTHON_HOME/lib/$python])
    elif test -f $PYTHON_HOME/lib/$python/config/lib$python.a ; then
    PYTHON_LIB="$PYTHON_HOME/lib/$python/config/lib$python.a"
    AC_MSG_RESULT([found in $PYTHON_HOME/lib/$python/config])
    fi
   
    else
                    for lib in python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
                         AC_CHECK_LIB($lib, PyArg_ParseTuple,[PYTHON_LIB="-l$lib"])                          AC_CHECK_LIB($lib, PyArg_ParseTuple,[PYTHON_LIB="-l$lib"])
                         if test "x$PYTHON_LIB" != "x" ; then                          if test "x$PYTHON_LIB" != "x" ; then
                                 break                                  break
Line 42
 
Line 82
  AC_MSG_RESULT([found in /usr/lib/$python/config])   AC_MSG_RESULT([found in /usr/lib/$python/config])
  fi   fi
  fi   fi
    fi
  if test "x$PYTHON_LIB" != "x"  ; then   if test "x$PYTHON_LIB" != "x"  ; then
  AC_CHECK_LIB(pthread, main,  PY_LIBS="$PY_LIBS -lpthread", , $PY_LIBS )   AC_CHECK_LIB(pthread, main,  PY_LIBS="$PY_LIBS -lpthread", , $PY_LIBS )
  AC_CHECK_LIB(util, main,  PY_LIBS="$PY_LIBS -lutil", , $PY_LIBS )   AC_CHECK_LIB(util, main,  PY_LIBS="$PY_LIBS -lutil", , $PY_LIBS )
    AC_CHECK_LIB(dl, main,  PY_LIBS="$PY_LIBS -ldl", , $PY_LIBS )
   
  AC_MSG_CHECKING([whether python supports the "L" format specifier])   AC_MSG_CHECKING([whether python supports the "L" format specifier])
  saved_LIBS="$LIBS"   saved_LIBS="$LIBS"


Legend:
line(s) removed in v.1.7 
line(s) changed
 line(s) added in v.1.8

File made using version 1.98 of cvs2html by leaf at 2011-07-21 16:53