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

Diff for /code/nel/acinclude.m4 between version 1.3 and 1.6

version 1.3, 2002/01/10 14:33:19 version 1.6, 2002/01/28 14:59:45
Line 64 
Line 64 
 dnl dnl
 dnl    Option:      "yes" if the use of the OpenAL library is mandatory. dnl    Option:      "yes" if the use of the OpenAL library is mandatory.
 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                 OPENAL_CFLAGS and OPENAL_LIB variables to use it. dnl                 OPENAL_CFLAGS and OPENAL_LIBS variables to use it.
 dnl dnl
 dnl dnl
 dnl AM_PATH_PYTHON dnl AM_PATH_PYTHON
Line 226 
Line 226 
                  
     if test $nel_libraries     if test $nel_libraries
     then     then
         NEL_TEST_LIB="-L$nel_libraries -l$nel_test_lib"         NEL_TEST_LIBS="-L$nel_libraries -l$nel_test_lib"
  
     else     else
         NEL_TEST_LIB="$nel_dir_lnk -l$nel_test_lib"         NEL_TEST_LIBS="$nel_dir_lnk -l$nel_test_lib"
     fi     fi
  
     _CPPFLAGS="$CPPFLAGS"     _CPPFLAGS="$CPPFLAGS"
Line 352 
Line 352 
     NEL_CFLAGS="-I$nel_includes"     NEL_CFLAGS="-I$nel_includes"
 fi fi
  
  if test "$nel_libraries"
  then
      NEL_LIBS="-L$nel_libraries"
  fi
  
 dnl Checking for NeL headers dnl Checking for NeL headers
 MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory) MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)
 MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory) MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)
Line 404 
Line 409 
     then     then
         stlport_includes="$with_stlport/stlport"         stlport_includes="$with_stlport/stlport"
         stlport_libraries="$with_stlport/lib"         stlport_libraries="$with_stlport/lib"
  
          if test ! -d "$stlport_includes"
          then
              stlport_includes="$with_stlport/include/stlport"
          fi
     fi     fi
 fi fi
  
Line 876 
Line 886 
 then then
     OPENAL_LIBS="-L$openal_libraries"     OPENAL_LIBS="-L$openal_libraries"
 fi fi
 OPENAL_LIB="$OPENAL_LIB -l$openal_lib" OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib"
  
 _CPPFLAGS="$CPPFLAGS" _CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS" CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"
Line 905 
Line 915 
 dnl Test the libraries dnl Test the libraries
 AC_MSG_CHECKING(for OpenAL libraries) AC_MSG_CHECKING(for OpenAL libraries)
  
 CPPFLAGS="$CXXFLAGS $OPENAL_LIB" CPPFLAGS="$CXXFLAGS $OPENAL_LIBS"
  
 AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no") AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no")
  
Line 939 
Line 949 
 fi fi
  
 AC_SUBST(OPENAL_CFLAGS) AC_SUBST(OPENAL_CFLAGS)
 AC_SUBST(OPENAL_LIB) AC_SUBST(OPENAL_LIBS)
  
  
 ]) ])

Legend:
Removed from v.1.3 
changed lines
 Added in v.1.6