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

Diff for /code/acinclude.m4 between version 1.9 and 1.13

version 1.9, 2002/03/19 17:42:48 version 1.13, 2002/04/16 12:01:39
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 251 
Line 256 
 nelpacs_is_mandatory="$4" nelpacs_is_mandatory="$4"
 nelsound_is_mandatory="$5" nelsound_is_mandatory="$5"
 nelai_is_mandatory="$6" nelai_is_mandatory="$6"
  nelgeorges_is_mandatory="$7"
  
 dnl Check for nel-config dnl Check for nel-config
 AC_PATH_PROG(NEL_CONFIG, nel-config, no) AC_PATH_PROG(NEL_CONFIG, nel-config, no)
Line 325 
Line 331 
 MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory) MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)
 MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory) MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)
 MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory) MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)
  MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory)
  
 dnl dnl
 dnl Collect libraries information and bark if missing and dnl Collect libraries information and bark if missing and
Line 335 
Line 342 
 MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory) MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)
 MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory) MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)
 MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory) MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)
 MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory) 
 MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory) MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)
  MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)
  MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory)
  
 ]) ])
  
Line 659 
Line 667 
  
 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 686 
Line 694 
     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 1042 
Line 1050 
 ]) ])
  
  
  # =========================================================================
  # 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.9 
changed lines
 Added in v.1.13