[BACK] Return to acinclude.m4 CVS log [TXT][DIR] Up to Nevrax / code / nelns

Diff for /code/nelns/acinclude.m4 between version 1.10 and 1.14

version 1.10, 2002/03/21 10:54:37 version 1.14, 2002/04/25 17:52:16
Line 73 
Line 73 
 dnl    Description: check the instalation of the OpenGL library and set the dnl    Description: check the instalation of the OpenGL library and set the
 dnl                 PYTHON_CFLAGS and PYTHON_LIBS variables to use it. dnl                 PYTHON_CFLAGS and PYTHON_LIBS variables to use it.
 dnl dnl
  dnl AM_PATH_CCACHE
  dnl
  dnl    Option:      none.
  dnl    Description: check the instalation of the Ccache utility.
  dnl
 dnl ========================================================================= dnl =========================================================================
  
  
Line 237 
Line 242 
 AC_ARG_WITH( nel-include, AC_ARG_WITH( nel-include,
     [  --with-nel-include=<path>     [  --with-nel-include=<path>
                           path to the NeL header files directory.                           path to the NeL header files directory.
                           e.g. /usr/local/nel/stlport])                           e.g. /usr/local/nel/include])
  
 AC_ARG_WITH( nel-lib, AC_ARG_WITH( nel-lib,
     [  --with-nel-lib=<path>     [  --with-nel-lib=<path>
Line 399 
Line 404 
     stlport_libraries="$with_stlport_lib"     stlport_libraries="$with_stlport_lib"
 fi fi
  
  dnl Check for the 'pthread' library. SLTPort needs it.
  AC_CHECK_LIB(pthread, main, , [AC_MSG_ERROR([cannot find the pthread library.])])
  
 AC_LANG_SAVE AC_LANG_SAVE
 AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
  
Line 662 
Line 670 
  
 dnl Checking the FreeType 2 instalation dnl Checking the FreeType 2 instalation
 _CPPFLAGS="$CPPFLAGS" _CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
  
 AC_MSG_CHECKING(for FreeType version = 2) AC_MSG_CHECKING(for FreeType version = 2)
  
Line 689 
Line 697 
     FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"     FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"
 fi fi
  
 CPPFLAGS="$CXXFLAGS $FREETYPE_LIBS" CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS"
          
 AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no") AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")
  
Line 1045 
Line 1053 
 ]) ])
  
  
  # =========================================================================
  # AM_PATH_CCACHE : Ccache checking macros
  
  AC_DEFUN(AM_PATH_CCACHE,
  [
  
  AC_ARG_WITH( ccache,
      [  --with-ccache           use ccache for compiling.],
      [ using_ccache=$with_ccache ]
  )
  
  AC_PATH_PROG(CCACHE, ccache)
  if test "$CCACHE" -a "$using_ccache" = "yes"
  then
      CC="ccache $CC"
      CXX="ccache $CXX"
  fi
  
  ])
  
  
 dnl ========================================================================= dnl =========================================================================
 dnl End of file dnl End of file
  

Legend:
Removed from v.1.10 
changed lines
 Added in v.1.14