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

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

version 1.45, 2001/08/01 17:15:45 version 1.46, 2001/08/02 15:58:55
Line 216 
Line 216 
 dnl Ask user for path to the STLport header files dnl Ask user for path to the STLport header files
 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 header 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_MSG_ERROR([You must call configure with the --with-stlport option. 
     This tells configure where to find the STLPort header files. 
     e.g. --with-stlport=/usr/local/include/stlport]) 
 ) )
  
 if test X"$STLPORT_DIR" != X; AC_ARG_WITH( stlport-include,
      [  --with-stlport-include=<path>
                            path to the STLPort header files directory.
                            e.g. /usr/local//stlport/include]
  )
  
  AC_ARG_WITH( stlport-lib,
      [  --with-stlport-lib=<path>
                            path to the STLPort header files directory.
                            e.g. /usr/local/stlport/lib]
  )
  
  if test "$with_stlport" != "no"
  then
      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 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_INCLUDE="$with_stlport/include"
         STLPORT_LIB="$with_stlport/lib"
      fi
  else
     no_stlport="no"
     AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)
  fi
  
  if test -z "$no_stlport" -a "$with_stlport_include"
 then then
     CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS"     AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)
      STLPORT_INCLUDE="$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="$with_stlport_lib"
 fi fi
  
  
Line 278 
Line 312 
   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 288 
Line 323 
   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.
Line 317 
Line 354 
 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], AC_MSG_RESULT([*** $STLPORT_INCLUDE *** $STLPORT_LIB ***])
     [STLLIB_DIR=$with_stllib 
       AC_MSG_RESULT(using STLPort library located in $with_stllib.)] 
 ) 
  
 if test X"$STLLIB_DIR" != X;    if test X"$STLPORT_INCLUDE" != X
 then then
     LIBS="-L$STLLIB_DIR $LIBS"       CXXFLAGS="-I$STLPORT_INCLUDE $CXXFLAGS"
 fi fi
  
 LIBS="$LIBS -lstlport_gcc"    if test X"$STLPORT_LIB" != X
     then
         LIBS="-L$STLPORT_LIB $LIBS -lstlport_gcc"
     fi
  
 _CPPFLAGS="$CPPFLAGS" _CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CXXFLAGS" CPPFLAGS="$CXXFLAGS"
Line 342 
Line 379 
    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 ==========

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