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

Diff for /code/nel/configure.in between version 1.48 and 1.52

version 1.48, 2001/08/08 09:37:04 version 1.52, 2001/10/09 13:43:06
Line 222 
Line 222 
 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/stlport ]                           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
Line 253 
Line 251 
         STLPORT_LIB="-L$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
  
Line 277 
Line 275 
 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 397 
 fi fi
  
  
  dnl ==========
  dnl LibXML
  dnl ==========
  
  if test "$enable_3d" = "yes"
  then
      AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) )
  fi
  
  
 dnl ==================================================================== dnl ====================================================================
 dnl Checks for libraries. dnl Checks for libraries.
  
Line 539 
Line 544 
 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.48 
changed lines
 Added in v.1.52