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

Diff for /code/nel/configure.in between version 1.56 and 1.60

version 1.56, 2002/01/07 16:09:52 version 1.60, 2002/03/19 17:42:48
Line 1 
Line 1 
 dnl dnl ====================================================================
 dnl Configuration script for NeL dnl Configuration script for NeL
  dnl ====================================================================
 dnl dnl
 dnl $Id$ dnl $Id$
 dnl  dnl
  
  
  dnl ====================================================================
 dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
  dnl ====================================================================
  
 AC_INIT(include/nel/nel.h) AC_INIT(include/nel/nel.h)
  
Line 40 
Line 44 
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks NeL modules (net, 3d, ai) to install / Disable dnl Checks NeL modules (net, 3d, ai) to install / Disable
  dnl ====================================================================
  
 dnl the misc is mandatory, it is use by the other modules. dnl the misc is mandatory, it is use by the other modules.
 NEL_SUBDIRS="misc" NEL_SUBDIRS="misc"
Line 113 
Line 118 
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for programs. dnl Checks for programs.
  dnl ====================================================================
  
 AC_PROG_MAKE_SET AC_PROG_MAKE_SET
  
Line 131 
Line 137 
  
 dnl ==================================================================== dnl ====================================================================
 dnl Configure Settings dnl Configure Settings
  dnl ====================================================================
  
 dnl Disable the static linking by default dnl Disable the static linking by default
 dnl AC_DISABLE_STATIC dnl AC_DISABLE_STATIC
Line 141 
Line 148 
  
 dnl ==================================================================== dnl ====================================================================
 dnl Debug/optimized compilation mode dnl Debug/optimized compilation mode
  dnl ====================================================================
  
 AM_NEL_DEBUG AM_NEL_DEBUG
  
  AC_ARG_WITH([logging],
      [  --without-logging  be silent on stdout and in no log.log],
      [
  if test "$with_logging" = "no"
  then
          AC_DEFINE(NEL_DEFAULT_DISPLAYER, 0)
          AC_DEFINE(NEL_LOG_IN_FILE, 0)
  else
          AC_MSG_ERROR([--with-logging is the default: do not use this option])
  fi
  ])
                            
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ====================================================================
  
 dnl Supress GCC "multi-character character constant" warnings. dnl Supress GCC "multi-character character constant" warnings.
 if test "X$CC" = "Xgcc"; if test "X$CC" = "Xgcc";
Line 164 
Line 185 
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for header files. dnl Checks for header files.
  dnl ====================================================================
  
 AC_STDC_HEADERS AC_STDC_HEADERS
 AC_CHECK_HEADERS(fcntl.h unistd.h) AC_CHECK_HEADERS(fcntl.h unistd.h)
  
  
 dnl ========== dnl ====================================================================
 dnl X11 dnl X11
 dnl ========== 
  
 AC_PATH_X AC_PATH_X
          
Line 194 
Line 215 
 fi fi
  
  
 dnl ========== dnl ====================================================================
 dnl STLPort dnl STLPort
 dnl ========== 
  
 AM_PATH_STLPORT AM_PATH_STLPORT
  
  
 dnl ========== dnl ====================================================================
 dnl OpenAL dnl OpenAL
 dnl ========== 
  
 AM_PATH_OPENAL( $enable_3d ) AM_PATH_OPENAL($enable_sound)
  
  
 dnl ========== dnl ====================================================================
 dnl Python dnl Python
 dnl ========== 
  
 AM_PATH_PYTHON( $enable_ai ) AM_PATH_PYTHON(1.5,$enable_ai)
  
  
 dnl ========== dnl ====================================================================
 dnl LibXML dnl LibXML
 dnl ========== 
  dnl Use C++ compiler as a default for the compilation tests.
  AC_LANG_C
  
 AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) ) AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) )
  
  dnl Use C++ compiler as a default for the compilation tests.
  AC_LANG_CPLUSPLUS
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for libraries. dnl Checks for libraries.
  dnl ====================================================================
  
 dnl ========== dnl ====================================================================
 dnl FreeType 2 dnl FreeType 2
 dnl ========== 
  
 AM_PATH_FREETYPE( $enable_3d ) AM_PATH_FREETYPE( $enable_3d )
  
  
 dnl ========== dnl ====================================================================
 dnl OpenGL dnl OpenGL
 dnl ========== 
  
 AM_PATH_OPENGL( $enable_3d ) AM_PATH_OPENGL( $enable_3d )
  
  
 dnl ============================================ dnl ====================================================================
 dnl Check for XF86VidMode extension (-lXxf86vm) dnl Check for XF86VidMode extension (-lXxf86vm)
 dnl ============================================ 
  
 AM_PATH_XF86VIDMODE AM_PATH_XF86VIDMODE
  
  dnl Arrange for the include directory to be in the search path even when
  dnl build is done outside the source tree
  CFLAGS="$CFLAGS -I\${top_srcdir}/include"
  CXXFLAGS="$CXXFLAGS -I\${top_srcdir}/include"
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for library functions. dnl Checks for library functions.
  dnl ====================================================================
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Output files to generate. dnl Output files to generate.
  dnl ====================================================================
 dnl What an ugly hack to try to get something cleanner ... i hope ... 
 AC_OUTPUT_COMMANDS( 
     [cd include/nel && ln -sfv ../nelconfig.h .] 
 ) 
  
 AC_OUTPUT( Makefile                          \ AC_OUTPUT( Makefile                          \
            include/Makefile                  \            include/Makefile                  \

Legend:
Removed from v.1.56 
changed lines
 Added in v.1.60