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

Diff for /code/nel/configure.in between version 1.42 and 1.55

version 1.42, 2001/08/01 09:20:08 version 1.55, 2001/11/07 16:25:13
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 45 
Line 45 
 NEL_SUBDIRS="misc" NEL_SUBDIRS="misc"
  
 dnl Network library dnl Network library
 AC_ARG_ENABLE( network, AC_ARG_ENABLE( net,
     [  --disable-network       disable compilation and install of NeL Network.],     [  --disable-net           disable compilation and install of NeL Network.],
     [ AC_MSG_RESULT(disable NEL Network.) ],     , enable_net=yes )
     [ NEL_SUBDIRS="$NEL_SUBDIRS net" ] ) 
  if test $enable_net = "no";
  then
     AC_MSG_RESULT(disable NEL Network.)
  else
     NEL_SUBDIRS="$NEL_SUBDIRS net"
  fi
  
 dnl 3D library dnl 3D library
 AC_ARG_ENABLE( 3d, AC_ARG_ENABLE( 3d,
     [  --disable-3d            disable compilation and install of NeL 3D.],     [  --disable-3d            disable compilation and install of NeL 3D.],
     [ AC_MSG_RESULT(disable NEL 3D.) ],     , enable_3d=yes )
     [ NEL_SUBDIRS="$NEL_SUBDIRS 3d" ] ) 
  if test $enable_3d = "no";
  then
     AC_MSG_RESULT(disable NEL 3D.)
  else
     NEL_SUBDIRS="$NEL_SUBDIRS 3d"
  fi
  
 dnl PACS library dnl PACS library
 AC_ARG_ENABLE( pacs, AC_ARG_ENABLE( pacs,
     [  --disable-pacs          disable compilation and install of NeL PACS.],     [  --disable-pacs          disable compilation and install of NeL PACS.],
     [ AC_MSG_RESULT(disable NEL PACS.) ],     , enable_pacs=yes )
     [ NEL_SUBDIRS="$NEL_SUBDIRS pacs" ] ) 
  if test $enable_pacs = "no";
  then
     AC_MSG_RESULT(disable NEL PACS.)
  else
     NEL_SUBDIRS="$NEL_SUBDIRS pacs"
  fi
  
  dnl Sound library
  AC_ARG_ENABLE( sound,
      [  --enable-sound          enable compilation and install of NeL Sound.],
      , enable_sound=no )
  
  if test $enable_sound = "yes";
  then
     AC_MSG_RESULT(enable NEL Sound.)
     NEL_SUBDIRS="$NEL_SUBDIRS sound"
  fi
  
 dnl AI library dnl AI library
 AC_ARG_ENABLE( ai, AC_ARG_ENABLE( ai,
     [  --disable-ai            disable compilation and install of NeL AI.],     [  --enable-ai             enable compilation and install of NeL AI.],
     [ AC_MSG_RESULT(disable NEL AI.) ],     , enable_ai=no )
     [ NEL_SUBDIRS="$NEL_SUBDIRS ai" ] ) 
  if test $enable_ai = "yes";
  then
     AC_MSG_RESULT(enable NEL AI.)
     NEL_SUBDIRS="$NEL_SUBDIRS ai"
  fi
  
  AC_SUBST(enable_net)
  AC_SUBST(enable_3d)
  AC_SUBST(enable_pacs)
  AC_SUBST(enable_sound)
  AC_SUBST(enable_ai)
  
 AC_SUBST(NEL_SUBDIRS) AC_SUBST(NEL_SUBDIRS)
  
Line 120 
Line 160 
 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 163 
Line 203 
  
 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/include/stlport],                           e.g. /usr/local/stlport])
     [STLPORT_DIR=$with_stlport 
       AC_MSG_RESULT(using STLPort header files located in $with_stlport)], AC_ARG_WITH( stlport-include,
     AC_MSG_ERROR([You must call configure with the --with-stlport option.     [  --with-stlport-include=<path>
     This tells configure where to find the STLPort header files.                           path to the STLPort header files directory.
     e.g. --with-stlport=/usr/local/include/stlport])                           e.g. /usr/local/stlport/stlport])
 ) 
  
 if test X"$STLPORT_DIR" != X; AC_ARG_WITH( stlport-lib,
      [  --with-stlport-lib=<path>
                            path to the STLPort library files directory.
                            e.g. /usr/local/stlport/lib])
  
  if test "$with_stlport" != "no"
 then then
     CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS" 
  #    if test -z "$with_stlport" && test -z "$with_stlport_lib" -o -z "$with_stlport_include"
  #    then
  #        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
  
      if test $with_stlport
      then
          AC_MSG_RESULT(using STLPort files located in $with_stlport)
  
          STLPORT_CFLAGS="-I$with_stlport/stlport"
          STLPORT_LIB="-L$with_stlport/lib"
      fi
  else
      no_stlport="yes"
      AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)
  fi
  
  if test -z "$no_stlport" -a "$with_stlport_include"
  then
      AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)
      STLPORT_CFLAGS="-I$with_stlport_include"
  fi
  
  if test -z "$no_stlport" -a  "$with_stlport_lib"
  then
      AC_MSG_RESULT(using STLPort library files located in $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 217 
Line 335 
    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 244 
Line 366 
   DEBUG_OPTIMIZE_CC=""   DEBUG_OPTIMIZE_CC=""
   OPTIMIZE_CFLAGS="-O"   OPTIMIZE_CFLAGS="-O"
 fi fi
  
 if test "$ac_cv_prog_cxx_g" = "yes" if test "$ac_cv_prog_cxx_g" = "yes"
 then then
   DEBUG_CXXFLAGS="-g"   DEBUG_CXXFLAGS="-g"
Line 254 
Line 377 
   DEBUG_OPTIMIZE_CXX=""   DEBUG_OPTIMIZE_CXX=""
   OPTIMIZE_CXXFLAGS="-O"   OPTIMIZE_CXXFLAGS="-O"
 fi fi
  
 AC_ARG_WITH(debug, AC_ARG_WITH(debug,
     [  --with-debug[=full]     Build a debug version (huge libraries)     [  --with-debug[=full]     Build a debug version (huge libraries)
   --without-debug         Build without debugging code (default)],   --without-debug         Build without debugging code (default)],
     [with_debug=$withval],     [with_debug=$withval],
     [with_debug=no])     [with_debug=no])
  
 if test "$with_debug" = "yes" if test "$with_debug" = "yes"
 then then
   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 274 
Line 400 
   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 283 
Line 417 
 dnl STLPort dnl STLPort
 dnl ========== dnl ==========
  
 dnl Ask user for path to the STLport header/library files if test -z "$no_stlport"
 AC_ARG_WITH( stllib, then
     [  --with-stllib=<path>    path to the STLPort installation directory. 
                           e.g. /usr/local/lib/stlport], 
     [STLLIB_DIR=$with_stllib 
       AC_MSG_RESULT(using STLPort library located in $with_stllib.)] 
 ) 
  
 if test X"$STLLIB_DIR" != X;     if test X"$STLPORT_CFLAGS" != X
 then then
     LIBS="-L$STLLIB_DIR $LIBS"         CXXFLAGS="$STLPORT_CFLAGS $CXXFLAGS"
 fi fi
  
 LIBS="$LIBS -lstlport_gcc"     if test X"$STLPORT_LIB" != X
      then
          LIBS="$STLPORT_LIB $LIBS -lstlport_gcc"
      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 308 
Line 440 
    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).]) )
 ) 
  
 CPPFLAGS="$_CPPFLAGS" CPPFLAGS="$_CPPFLAGS"
  fi
  
 dnl ========== dnl ==========
 dnl FreeType 2 dnl FreeType 2
Line 321 
Line 452 
 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 343 
Line 475 
    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 361 
Line 498 
    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 374 
Line 515 
 #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 398 
Line 543 
 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.42 
changed lines
 Added in v.1.55