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

Diff for /code/nel/configure.in between version 1.46 and 1.54

version 1.46, 2001/08/02 15:58:55 version 1.54, 2001/10/31 09:54:43
Line 34 
Line 34 
  
 dnl The following hack should ensure that configure doesnt add optimizing dnl The following hack should ensure that configure doesnt add optimizing
 dnl or debugging flags to CFLAGS or CXXFLAGS dnl or debugging flags to CFLAGS or CXXFLAGS
 CFLAGS="$CFLAGS " CFLAGS="$CFLAGS -ftemplate-depth-24"
 CXXFLAGS="$CXXFLAGS " CXXFLAGS="$CXXFLAGS -ftemplate-depth-24"
  
  
 dnl ==================================================================== dnl ====================================================================
Line 154 
Line 154 
 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" -a "$enable_ai" = "yes"
 then then
     AC_MSG_ERROR([Python is needed to compile NeL (www.python.org)])     AC_MSG_ERROR([Python is needed to compile NeL (www.python.org)])
 fi fi
Line 197 
Line 197 
  
 AC_PATH_X AC_PATH_X
          
 if test ! "$no_x" = "yes" ; then if test ! "$no_x" = "yes"
     if test ! X"$x_libraries" = X ; then then
      if test ! X"$x_libraries" = X
      then
         LIBS="$LIBS -L$x_libraries"         LIBS="$LIBS -L$x_libraries"
     fi     fi
     if test ! X"$x_includes" = X ; then     if test ! X"$x_includes" = X
      then
         CXXFLAGS="$CXXFLAGS -I$x_includes"         CXXFLAGS="$CXXFLAGS -I$x_includes"
     fi     fi
 else else
      if test "$enable_3d" = "yes"
      then
     AC_MSG_ERROR(X11 must be installed.)     AC_MSG_ERROR(X11 must be installed.)
 fi fi
  fi
  
  
 dnl ========== dnl ==========
 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/stlport]                           e.g. /usr/local/stlport])
 ) 
  
 AC_ARG_WITH( stlport-include, AC_ARG_WITH( stlport-include,
     [  --with-stlport-include=<path>     [  --with-stlport-include=<path>
                           path to the STLPort header files directory.                           path to the STLPort header files directory.
                           e.g. /usr/local//stlport/include]                           e.g. /usr/local/stlport/stlport])
 ) 
  
 AC_ARG_WITH( stlport-lib, AC_ARG_WITH( stlport-lib,
     [  --with-stlport-lib=<path>     [  --with-stlport-lib=<path>
                           path to the STLPort header files directory.                           path to the STLPort library files directory.
                           e.g. /usr/local/stlport/lib]                           e.g. /usr/local/stlport/lib])
 ) 
  
 if test "$with_stlport" != "no" if test "$with_stlport" != "no"
 then then
     if test -z "$with_stlport" && test -z "$with_stlport_lib" -o -z "$with_stlport_include"  
     then #    if test -z "$with_stlport" && test -z "$with_stlport_lib" -o -z "$with_stlport_include"
         AC_MSG_ERROR([You must call configure with the --with-stlport or --with-stlport and with-stlport-include options. #    then
 This tells configure where to find the STLPort files.]) #        AC_MSG_ERROR([You must call configure with the --with-stlport or --with-stlport-lib and with-stlport-include options.
     fi #This tells configure where to find the STLPort files.])
  #    fi
  
     if test $with_stlport     if test $with_stlport
     then     then
        AC_MSG_RESULT(using STLPort files located in $with_stlport)        AC_MSG_RESULT(using STLPort files located in $with_stlport)
  
        STLPORT_INCLUDE="$with_stlport/include"         STLPORT_CFLAGS="-I$with_stlport/stlport"
        STLPORT_LIB="$with_stlport/lib"         STLPORT_LIB="-L$with_stlport/lib"
     fi     fi
 else else
    no_stlport="no"     no_stlport="yes"
    AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)    AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)
 fi fi
  
 if test -z "$no_stlport" -a "$with_stlport_include" if test -z "$no_stlport" -a "$with_stlport_include"
 then then
     AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)     AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)
     STLPORT_INCLUDE="$with_stlport_include"     STLPORT_CFLAGS="-I$with_stlport_include"
 fi fi
  
 if test -z "$no_stlport" -a  "$with_stlport_lib" if test -z "$no_stlport" -a  "$with_stlport_lib"
 then then
     AC_MSG_RESULT(using STLPort library files located in $with_stlport_lib)     AC_MSG_RESULT(using STLPort library files located in $with_stlport_lib)
     STLPORT_LIB="$with_stlport_lib"     STLPORT_LIB="-L$with_stlport_lib"
  fi
  
  
  dnl ==========
  dnl OpenAL
  dnl ==========
  
  dnl Ask user for path to the OpenAL files location
  AC_ARG_WITH( openal,
      [  --with-openal=<path>   path to the OpenAL install files directory.
                            e.g. /usr/local])
  
  AC_ARG_WITH( openal-include,
      [  --with-openal-include=<path>
                            path to the OpenAL header files directory.
                            e.g. /usr/local/include])
  
  AC_ARG_WITH( openal-lib,
      [  --with-openal-lib=<path>
                            path to the OpenAL library files directory.
                            e.g. /usr/local/lib])
  
  if test $with_openal
  then
      AC_MSG_RESULT(using OpenAL files located in $with_openal)
  
      OPENAL_CFLAGS="-I$with_openal/include"
      OPENAL_LIB="-L$with_openal/lib"
  fi
  
  if test "$with_openal_include"
  then
      AC_MSG_RESULT(using OpenAL header files located in $with_openal_include)
      OPENAL_CFLAGS="-I$with_openal_include"
  fi
  
  if test "$with_openal_lib"
  then
      AC_MSG_RESULT(using OpenAL library files located in $with_openal_lib)
      OPENAL_LIB="-L$with_openal_lib"
 fi fi
  
  
Line 285 
Line 329 
    yo_python    yo_python
 ], ],
 [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(ok)],
    AC_MSG_RESULT(no)
    if test "$enable_ai" = "yes"
    then
 AC_MSG_ERROR([Python is needed to compile NeL (www.python.org).]) AC_MSG_ERROR([Python is needed to compile NeL (www.python.org).])
    fi
 ) )
  
 CPPFLAGS="$_CPPFLAGS" CPPFLAGS="$_CPPFLAGS"
Line 335 
Line 383 
   dnl Medium debug.   dnl Medium debug.
   CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS"   CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS"
   CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS"   CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS"
 elif test "$with_debug" = "full" else
      if test "$with_debug" = "full"
 then then
   dnl Full debug. Very slow in some cases   dnl Full debug. Very slow in some cases
   CFLAGS="$DEBUG_CFLAGS $CFLAGS"   CFLAGS="$DEBUG_CFLAGS $CFLAGS"
Line 345 
Line 394 
   CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"   CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
   CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"   CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
 fi fi
  fi
  
  
  dnl ==========
  dnl LibXML
  dnl ==========
  
  AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) )
  
  
 dnl ==================================================================== dnl ====================================================================
Line 357 
Line 414 
 if test -z "$no_stlport" if test -z "$no_stlport"
 then then
  
 AC_MSG_RESULT([*** $STLPORT_INCLUDE *** $STLPORT_LIB ***])     if test X"$STLPORT_CFLAGS" != X
  
    if test X"$STLPORT_INCLUDE" != X 
    then    then
       CXXFLAGS="-I$STLPORT_INCLUDE $CXXFLAGS"         CXXFLAGS="$STLPORT_CFLAGS $CXXFLAGS"
    fi    fi
  
    if test X"$STLPORT_LIB" != X    if test X"$STLPORT_LIB" != X
    then    then
        LIBS="-L$STLPORT_LIB $LIBS -lstlport_gcc"         LIBS="$STLPORT_LIB $LIBS -lstlport_gcc"
    fi    fi
  
    _CPPFLAGS="$CPPFLAGS"    _CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CXXFLAGS"     CPPFLAGS="$CXXFLAGS $STLPORT_CFLAGS"
  
    AC_MSG_CHECKING(for STLPort)    AC_MSG_CHECKING(for STLPort)
    AC_EGREP_CPP( yo_stlport,    AC_EGREP_CPP( yo_stlport,
Line 382 
Line 437 
      AC_MSG_ERROR([STLPort is needed to compile NeL (www.stlport.org).]) )      AC_MSG_ERROR([STLPort is needed to compile NeL (www.stlport.org).]) )
  
    CPPFLAGS="$_CPPFLAGS"    CPPFLAGS="$_CPPFLAGS"
  
 fi fi
  
  
 dnl ========== dnl ==========
 dnl FreeType 2 dnl FreeType 2
 dnl ========== dnl ==========
Line 393 
Line 446 
 dnl Check for the FreeType 2 library files dnl Check for the FreeType 2 library files
 AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
  
 if test "$FREETYPE_CONFIG" = "no"; then if test "$FREETYPE_CONFIG" = "no" -a "$enable_3d" = "yes"
  then
     AC_MSG_ERROR([Cannot find freetype-config: check your path.     AC_MSG_ERROR([Cannot find freetype-config: check your path.
     FreeType 2 library is needed to compile NeL (freetype.sourceforge.net).])     FreeType 2 library is needed to compile NeL (freetype.sourceforge.net).])
 else else
Line 415 
Line 469 
    yo_freetype2    yo_freetype2
 #endif], #endif],
 [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(yes)],
    if test "$enable_3d" = "yes"
    then
 AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (freetype.sourceforge.net).]) AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (freetype.sourceforge.net).])
    else
        AC_MSG_RESULT(no)
    fi
 ) )
  
 CPPFLAGS="$_CPPFLAGS" CPPFLAGS="$_CPPFLAGS"
Line 433 
Line 492 
    yo_opengl    yo_opengl
 #endif], #endif],
 [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(yes)],
    AC_MSG_RESULT(no)
    if test "$enable_3d" = "yes"
    then
 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).])
    fi
 ) )
  
 dnl Checking the GLEXT version dnl Checking the GLEXT version
Line 446 
Line 509 
 #endif #endif
 #endif], #endif],
 [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(ok)],
    if test "$enable_3d" = "yes"
    then
       AC_MSG_RESULT(no)
 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/).])
    fi
 ) )
  
  
Line 470 
Line 537 
 fi fi
  
  
  dnl ==========
  dnl OpenAL
  dnl ==========
  
  AC_SUBST(OPENAL_CFLAGS)
  AC_SUBST(OPENAL_LIB)
  
  _CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"
  
  AC_MSG_CHECKING(for OpenAL)
  AC_EGREP_CPP( yo_openal,
  [#include <AL/altypes.h>
  #ifdef AL_VERSION
     yo_openal
  #endif],
  [ AC_MSG_RESULT(yes)],
    AC_MSG_RESULT(no)
    if test "$enable_sound" = "yes"
    then
        AC_MSG_ERROR([OpenAL is needed to compile NeL (www.openal.org).])
    fi
  )
  
  CPPFLAGS="$_CPPFLAGS"
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for library functions. dnl Checks for library functions.
  

Legend:
Removed from v.1.46 
changed lines
 Added in v.1.54