[BACK] Return to acinclude.m4 CVS log [TXT][DIR] Up to Nevrax / code

Diff for /code/acinclude.m4 between version 1.1 and 1.4

version 1.1, 2002/01/07 16:09:52 version 1.4, 2002/01/22 14:24:56
Line 87 
Line 87 
 STL_DEBUG="-D__STL_DEBUG" STL_DEBUG="-D__STL_DEBUG"
  
 NL_DEBUG="-DNL_DEBUG" NL_DEBUG="-DNL_DEBUG"
 dnl NL_DEBUG_FAST="-DNL_DEBUG_FAST" NL_DEBUG_FAST="-DNL_DEBUG_FAST"
 NL_RELEASE_DEBUG="-DNL_RELEASE_DEBUG" NL_RELEASE_DEBUG="-DNL_RELEASE_DEBUG"
 NL_RELEASE="-DNL_RELEASE" NL_RELEASE="-DNL_RELEASE"
  
Line 352 
Line 352 
     NEL_CFLAGS="-I$nel_includes"     NEL_CFLAGS="-I$nel_includes"
 fi fi
  
  if test "$nel_libraries"
  then
      NEL_LIBS="-L$nel_libraries"
  fi
  
 dnl Checking for NeL headers dnl Checking for NeL headers
 MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory) MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)
 MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory) MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)
Line 949 
Line 954 
 # AM_PATH_PYTHON : Python checking macros # AM_PATH_PYTHON : Python checking macros
  
 AC_DEFUN(AM_PATH_PYTHON, AC_DEFUN(AM_PATH_PYTHON,
 [ is_mandatory="$1" [ python_version_required="$1"
  
  is_mandatory="$2"
  
 AC_REQUIRE_CPP() AC_REQUIRE_CPP()
  
Line 975 
Line 982 
 then then
     PYTHON_EXEC="python$PYTHON_VERSION"     PYTHON_EXEC="python$PYTHON_VERSION"
 else else
     PYTHON_EXEC="python python2.0 python1.5"     PYTHON_EXEC="python python2.1 python2.0 python1.5"
 fi fi
  
 AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH) AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH)
  
 if test "$PYTHON" = "no" if test "$PYTHON" != "no"
  then
      PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'`
      PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'`
  
      is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION`
  fi
  
  
  if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1"
 then then
  
     if test "$is_mandatory" = "yes"     if test "$is_mandatory" = "yes"
     then     then
         AC_MSG_ERROR([Python must be installed (http://www.python.org)])         AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)])
     else     else
         have_python="no"         have_python="no"
     fi     fi
  
 else else
  
     PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'` 
     PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'` 
  
     python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION"     python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION"
     python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config"     python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config"

Legend:
Removed from v.1.1 
changed lines
 Added in v.1.4