[BACK] Return to configure.in CVS log [TXT][DIR] Up to Nevrax / code / nelns

Diff for /code/nelns/configure.in between version 1.2 and 1.5

version 1.2, 2001/05/03 13:19:13 version 1.5, 2001/08/07 12:58:26
Line 38 
Line 38 
 AC_PROG_INSTALL AC_PROG_INSTALL
  
  
 dnl ========== 
 dnl Python 
 dnl ========== 
  
 AC_ARG_WITH( python, 
     [  --with-python=<path>    path to the Python prefix installation directory. 
                           e.g. /usr/local], 
     [PYTHON_PREFIX=$withval 
       AC_MSG_RESULT(using Python located in $withval.)] 
 ) 
  
 if test ! "$PYTHON_PREFIX" = "" 
 then 
     PATH="$PYTHON_PREFIX/bin:$PATH" 
 fi 
  
 AC_ARG_WITH( python-version, 
     [  --with-python-version=<version> 
                           Python version to use, e.g. 1.5], 
     [PYTHON_VERSION=$withval 
       AC_MSG_RESULT(using Python $withval.)] 
 ) 
  
 if test ! "$PYTHON_VERSION" = "" 
 then 
     PYTHON_EXEC="python$PYTHON_VERSION" 
 else 
     PYTHON_EXEC="python python2.0 python1.5" 
 fi 
  
 AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH) 
 if test "$PYTHON" = "no"; 
 then 
     AC_MSG_ERROR([Python is needed to compile NeL (www.python.org)]) 
 fi 
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Configure Settings dnl Configure Settings
  
Line 104 
Line 67 
 dnl STLPort dnl STLPort
 dnl ========== dnl ==========
  
 dnl Ask user for path to the STLport header files dnl Ask user for path to the STLport files location
 AC_ARG_WITH( stlport, AC_ARG_WITH( stlport,
     [  --with-stlport=<path>   path to the STLPort header files directory.     [  --with-stlport=<path>   path to the STLPort install files directory.
                           e.g. /usr/local/include/stlport],                           e.g. /usr/local/stlport]
     [STLPORT_DIR=$with_stlport 
       AC_MSG_RESULT(using STLPort header files located in $with_stlport)], 
     AC_MSG_ERROR([You must call configure with the --with-stlport option. 
     This tells configure where to find the STLPort header files. 
     e.g. --with-stlport=/usr/local/include/stlport]) 
 ) )
  
 if test X"$STLPORT_DIR" != X""; AC_ARG_WITH( stlport-include,
 then     [  --with-stlport-include=<path>
     CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS"                           path to the STLPort header files directory.
 fi                           e.g. /usr/local/stlport/include]
  )
  
 dnl Ask user for path to the STLPort library files AC_ARG_WITH( stlport-lib,
 AC_ARG_WITH( stllib,     [  --with-stlport-lib=<path>
     [  --with-stllib=<path>    path to the STLPort installation directory.                           path to the STLPort library files directory.
                           e.g. /usr/local/lib/stlport],                           e.g. /usr/local/stlport/lib]
     [STLLIB_DIR=$with_stllib 
       AC_MSG_RESULT(using STLPort library located in $with_stllib)] 
 ) )
  
 if test X"$STLLIB_DIR" != X""; if test "$with_stlport" != "no"
  then
      if test -z "$with_stlport" && test -z "$with_stlport_lib" -o -z "$with_stlpo
  rt_include"
 then then
     LIBS="-L$STLLIB_DIR $LIBS"         AC_MSG_ERROR([You must call configure with the --with-stlport or --with-stlport-lib and with-stlport-include options.
  This tells configure where to find the STLPort files.])
 fi fi
  
 LIBS="$LIBS -lstlport_gcc"     if test $with_stlport
      then
          AC_MSG_RESULT(using STLPort files located in $with_stlport)
  
 _CPPFLAGS="$CPPFLAGS"         STLPORT_CFLAGS="$with_stlport/include"
 CPPFLAGS="$CXXFLAGS"         STLPORT_LIB="$with_stlport/lib"
      fi
  else
      no_stlport="no"
      AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)
  fi
  
 AC_MSG_CHECKING(for STLPort) if test -z "$no_stlport" -a "$with_stlport_include"
 AC_EGREP_CPP( yo_stlport, then
 [#include <algorithm>     AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)
 #ifdef __SGI_STL_PORT     STLPORT_CFLAGS="$with_stlport_include"
    yo_stlport fi
 #endif], 
 [AC_MSG_RESULT(yes)], 
 AC_MSG_ERROR([STLPort is needed to compile NeLNS (www.stlport.org)]) 
 ) 
  
 CPPFLAGS="$_CPPFLAGS" if test -z "$no_stlport" -a  "$with_stlport_lib"
  then
      AC_MSG_RESULT(using STLPort library files located in $with_stlport_lib)
      STLPORT_LIB="$with_stlport_lib"
  fi
  
  
 dnl ========== dnl ==========
Line 184 
Line 152 
  
  
 dnl ========== dnl ==========
 dnl Python 
 dnl ========== 
  
 PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'` 
 PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'` 
  
 PYTHON_CFLAGS="-I$PYTHON_PREFIX/include/python$PYTHON_VERSION" 
 PYTHON_LIBS="-L$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config -lpython$PYTHON_VERSION" 
  
 _CPPFLAGS="$CPPFLAGS" 
 CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}" 
  
 AC_SUBST(PYTHON_CFLAGS) 
  
 AC_MSG_CHECKING(for Python header files) 
 AC_EGREP_CPP( yo_python, 
 [#include <Python.h> 
    yo_python 
 ], 
 [AC_MSG_RESULT(ok)], 
 AC_MSG_ERROR([Python is needed to compile NeL (www.python.org).]) 
 ) 
  
 CPPFLAGS="$_CPPFLAGS" 
  
 AC_SUBST(PYTHON_CFLAGS) 
 AC_SUBST(PYTHON_LIBS) 
  
  
 dnl ========== 
 dnl Debug/optimized compilation mode dnl Debug/optimized compilation mode
 dnl ========== dnl ==========
  
Line 266 
Line 204 
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for libraries. dnl Checks for libraries.
  
  dnl ==========
  dnl STLPort
  dnl ==========
  
  if test -z "$no_stlport"
  then
    
      if test X"$STLPORT_CFLAGS" != X
      then
          CXXFLAGS="-I$STLPORT_CFLAGS $CXXFLAGS"
      fi
  
      if test X"$STLPORT_LIB" != X
      then
          LIBS="-L$STLPORT_LIB $LIBS -lstlport_gcc"
      fi
  
      _CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CXXFLAGS $STLPORT_CFLAGS"
  
      AC_MSG_CHECKING(for STLPort)
      AC_EGREP_CPP( yo_stlport,
      [#include <algorithm>
  #ifdef __SGI_STL_PORT
     yo_stlport
  #endif],
      [ AC_MSG_RESULT(yes)],
        AC_MSG_ERROR([STLPort is needed to compile NeL (www.stlport.org).]) )
      
        CPPFLAGS="$_CPPFLAGS"
  fi
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for library functions. dnl Checks for library functions.
Line 279 
Line 249 
            log_service/Makefile            \            log_service/Makefile            \
            naming_service/Makefile         \            naming_service/Makefile         \
            time_service/Makefile           \            time_service/Makefile           \
            agent_service/Makefile          \ 
            agent_service/creature/Makefile \ 
            agent_service/plugin/Makefile   \ 
            admin_executor_service/Makefile \            admin_executor_service/Makefile \
            admin_service/Makefile          \            admin_service/Makefile          \
            welcome_service/Makefile        \            welcome_service/Makefile        \

Legend:
Removed from v.1.2 
changed lines
 Added in v.1.5