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

Diff for /code/nel/configure.in between version 1.31 and 1.34

version 1.31, 2001/04/03 12:32:21 version 1.34, 2001/04/12 12:41:49
Line 20 
Line 20 
 MINOR_VERSION=3 MINOR_VERSION=3
 PICO_VERSION=0 PICO_VERSION=0
  
 AM_INIT_AUTOMAKE(nel,$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION) VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION
  
  AM_INIT_AUTOMAKE(nel,$VERSION)
  
 LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:$PICO_VERSION LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:$PICO_VERSION
  
  AC_SUBST(VERSION)
 AC_SUBST(LIBTOOL_VERSION) AC_SUBST(LIBTOOL_VERSION)
  
 AM_CONFIG_HEADER(include/nelconfig.h) AM_CONFIG_HEADER(include/nelconfig.h)
  
  
  dnl The following hack should ensure that configure doesn't add optimizing
  dnl or debugging flags to CFLAGS or CXXFLAGS
  CFLAGS="$CFLAGS "
  CXXFLAGS="$CXXFLAGS "
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for programs. dnl Checks for programs.
  
Line 64 
Line 73 
 fi fi
  
 AC_ARG_WITH( python-version, AC_ARG_WITH( python-version,
     [ --with-python-version=<version>     Python version to use, e.g. 1.5],     [  --with-python-version=<version>
                            Python version to use, e.g. 1.5],
     [PYTHON_VERSION=$withval     [PYTHON_VERSION=$withval
       AC_MSG_RESULT(using Python $withval.)]       AC_MSG_RESULT(using Python $withval.)]
 ) )
Line 168 
Line 178 
  
 AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_CFLAGS)
  
 AC_MSG_CHECKING("for Python header files") AC_MSG_CHECKING(for Python header files)
 AC_EGREP_CPP( yo_python, AC_EGREP_CPP( yo_python,
 [#include <Python.h> [#include <Python.h>
    yo_python    yo_python
 ], ],
 [AC_MSG_RESULT("ok")], [AC_MSG_RESULT(ok)],
 AC_MSG_ERROR([Python is needed to compile NeL (www.python.org).]) AC_MSG_ERROR([Python is needed to compile NeL (www.python.org).])
 ) )
  
Line 183 
Line 193 
 AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_LIBS)
  
  
  dnl ==========
  dnl Debug/optimized compilation mode
  dnl ==========
  
  MAX_C_OPTIMIZE="-O6"
  
  dnl Build optimized or debug version ?
  dnl First check for gcc and g++
  if test "$ac_cv_prog_gcc" = "yes"
  then
    DEBUG_CFLAGS="-g"
    DEBUG_OPTIMIZE_CC="-O"
    OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
  else
    DEBUG_CFLAGS="-g"
    DEBUG_OPTIMIZE_CC=""
    OPTIMIZE_CFLAGS="-O"
  fi
  if test "$ac_cv_prog_cxx_g" = "yes"
  then
    DEBUG_CXXFLAGS="-g"
    DEBUG_OPTIMIZE_CXX="-O"
    OPTIMIZE_CXXFLAGS="-O3"
  else
    DEBUG_CXXFLAGS="-g"
    DEBUG_OPTIMIZE_CXX=""
    OPTIMIZE_CXXFLAGS="-O"
  fi
  AC_ARG_WITH(debug,
      [  --with-debug[=full]     Build a debug version (huge libraries)
    --without-debug         Build withoug debugging code (default)],
      [with_debug=$withval],
      [with_debug=no])
  if test "$with_debug" = "yes"
  then
    dnl Medium debug.
    CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS"
    CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS"
  elif test "$with_debug" = "full"
  then
    dnl Full debug. Very slow in some cases
    CFLAGS="$DEBUG_CFLAGS $CFLAGS"
    CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS"
  else
    dnl Optimized version. No debug
    CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
    CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
  fi
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for libraries. dnl Checks for libraries.
  
Line 208 
Line 268 
 _CPPFLAGS="$CPPFLAGS" _CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CXXFLAGS" CPPFLAGS="$CXXFLAGS"
  
 AC_MSG_CHECKING("for STLPort") AC_MSG_CHECKING(for STLPort)
 AC_EGREP_CPP( yo_stlport, AC_EGREP_CPP( yo_stlport,
 [#include <algorithm> [#include <algorithm>
 #ifdef __SGI_STL_PORT #ifdef __SGI_STL_PORT
    yo_stlport    yo_stlport
 #endif], #endif],
 [AC_MSG_RESULT("yes")], [AC_MSG_RESULT(yes)],
 AC_MSG_ERROR([STLPort is needed to compile NeL (www.stlport.org).]) AC_MSG_ERROR([STLPort is needed to compile NeL (www.stlport.org).])
 ) )
  
Line 243 
Line 303 
 _CPPFLAGS="$CPPFLAGS" _CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}" CPPFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
  
 AC_MSG_CHECKING("for FreeType 2 installation") AC_MSG_CHECKING(for FreeType 2 installation)
 AC_EGREP_CPP( yo_freetype2, AC_EGREP_CPP( yo_freetype2,
 [#include <freetype/freetype.h> [#include <freetype/freetype.h>
 #if FREETYPE_MAJOR == 2 #if FREETYPE_MAJOR == 2
    yo_freetype2    yo_freetype2
 #endif], #endif],
 [AC_MSG_RESULT("yes")], [AC_MSG_RESULT(yes)],
 AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (www.stlport.org).]) AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (www.stlport.org).])
 ) )
  
Line 261 
Line 321 
 dnl ========== dnl ==========
  
 dnl Checking the OpenGL installation dnl Checking the OpenGL installation
 AC_MSG_CHECKING("for OpenGL installation") AC_MSG_CHECKING(for OpenGL)
 AC_EGREP_CPP( yo_opengl, AC_EGREP_CPP( yo_opengl,
 [#include <GL/gl.h> [#include <GL/gl.h>
 #if defined(GL_VERSION_1_2) #if defined(GL_VERSION_1_2)
    yo_opengl    yo_opengl
 #endif], #endif],
 [AC_MSG_RESULT("yes")], [AC_MSG_RESULT(yes)],
 AC_MSG_ERROR([OpenGL 1.2 is needed to compile NeL (www.mesa3d.org).]) AC_MSG_ERROR([OpenGL 1.2 is needed to compile NeL (www.mesa3d.org).])
 ) )
  
Line 280 
Line 340 
    yo_glext_version    yo_glext_version
 #endif #endif
 #endif], #endif],
 [AC_MSG_RESULT("yes")], [AC_MSG_RESULT(ok)],
 AC_MSG_ERROR([A newer version of <GL/glext.h> is needed to compile NeL (download it from http://oss.sgi.com/projects/ogl-sample/ABI/).]) AC_MSG_ERROR([A newer version of <GL/glext.h> is needed to compile NeL (download it from http://oss.sgi.com/projects/ogl-sample/ABI/).])
 ) )
  
  
  dnl ============================================
  dnl Check for XF86VidMode extension (-lXxf86vm)
  dnl ============================================
  AC_MSG_CHECKING("for XF86VidMode extension")
  AC_ARG_WITH( xf86vidmode,
      [  --with-xf86vidmode=<path>
                             path to the XF86VidMode lib.
                             e.g. /usr/X11R6/lib],
      [VMLIB_DIR=$with_xf86vidmode
        AC_MSG_RESULT(using VidMode library located in $with_xf86vidmode.)],
      AC_MSG_RESULT(Compiling without Xf86VidMode and hence fullscreen support to compile with XF86VidMode support, use --with-xf86vidmode=<pathtolib>)
  )
  
  if test X"$VMLIB_DIR" != X;
  then
      LIBS="-L$VMLIB_DIR -lXxf86vm $LIBS";
      CXXFLAGS="$CXXFLAGS -DXF86VIDMODE";
  fi
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for library functions. dnl Checks for library functions.
  
Line 316 
Line 396 
            src/ai/pyserver/Makefile       \            src/ai/pyserver/Makefile       \
            src/ai/script/Makefile         \            src/ai/script/Makefile         \
            src/ai/tools/Makefile          \            src/ai/tools/Makefile          \
  )
  
  
 dnl End of configure.in dnl End of configure.in

Legend:
Removed from v.1.31 
changed lines
 Added in v.1.34