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

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

version 1.47, 2001/08/03 16:36:50 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 102 
Line 102 
    NEL_SUBDIRS="$NEL_SUBDIRS ai"    NEL_SUBDIRS="$NEL_SUBDIRS ai"
 fi 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 222 
Line 228 
 dnl Ask user for path to the STLport files location 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 install 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 library 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-lib 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_CFLAGS="$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_CFLAGS="$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 fi
  
  
Line 277 
Line 281 
 dnl Ask user for path to the OpenAL files location dnl Ask user for path to the OpenAL files location
 AC_ARG_WITH( openal, AC_ARG_WITH( openal,
     [  --with-openal=<path>   path to the OpenAL install files directory.     [  --with-openal=<path>   path to the OpenAL install files directory.
                           e.g. /usr/local]                           e.g. /usr/local])
 ) 
  
 AC_ARG_WITH( openal-include, AC_ARG_WITH( openal-include,
     [  --with-openal-include=<path>     [  --with-openal-include=<path>
                           path to the OpenAL header files directory.                           path to the OpenAL header files directory.
                           e.g. /usr/local/include]                           e.g. /usr/local/include])
 ) 
  
 AC_ARG_WITH( openal-lib, AC_ARG_WITH( openal-lib,
     [  --with-openal-lib=<path>     [  --with-openal-lib=<path>
                           path to the OpenAL library files directory.                           path to the OpenAL library files directory.
                           e.g. /usr/local/lib]                           e.g. /usr/local/lib])
 ) 
  
 if test $with_openal if test $with_openal
 then then
     AC_MSG_RESULT(using OpenAL files located in $with_openal)     AC_MSG_RESULT(using OpenAL files located in $with_openal)
  
     OPENAL_CFLAGS="$with_openal/include"     OPENAL_CFLAGS="-I$with_openal/include"
     OPENAL_LIB="$with_openal/lib"     OPENAL_LIB="-L$with_openal/lib"
 fi fi
  
 if test "$with_openal_include" if test "$with_openal_include"
 then then
     AC_MSG_RESULT(using OpenAL header files located in $with_openal_include)     AC_MSG_RESULT(using OpenAL header files located in $with_openal_include)
     OPENAL_CFLAGS="$with_openal_include"     OPENAL_CFLAGS="-I$with_openal_include"
 fi fi
  
 if test "$with_openal_lib" if test "$with_openal_lib"
 then then
     AC_MSG_RESULT(using OpenAL library files located in $with_openal_lib)     AC_MSG_RESULT(using OpenAL library files located in $with_openal_lib)
     OPENAL_LIB="$with_openal_lib"     OPENAL_LIB="-L$with_openal_lib"
 fi fi
  
  
Line 402 
Line 403 
 fi fi
  
  
  dnl ==========
  dnl LibXML
  dnl ==========
  
  AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) )
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for libraries. dnl Checks for libraries.
  
Line 414 
Line 422 
  
     if test X"$STLPORT_CFLAGS" != X     if test X"$STLPORT_CFLAGS" != X
     then     then
         CXXFLAGS="-I$STLPORT_CFLAGS $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"
Line 539 
Line 547 
 dnl OpenAL dnl OpenAL
 dnl ========== dnl ==========
  
 if test X"$OPENAL_CFLAGS" != X 
 then 
    CXXFLAGS="-I$OPENAL_CFLAGS $CXXFLAGS" 
 fi 
  
 if test X"$OPENAL_LIB" != X 
 then 
     LIBS="-L$OPENAL_LIB $LIBS -lstlport_gcc" 
 fi 
  
 AC_SUBST(OPENAL_CFLAGS) AC_SUBST(OPENAL_CFLAGS)
 AC_SUBST(OPENAL_LIBS) AC_SUBST(OPENAL_LIB)
  
 _CPPFLAGS="$CPPFLAGS" _CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS" CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"

Legend:
Removed from v.1.47 
changed lines
 Added in v.1.55