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

Diff for /code/acinclude.m4 between version 1.5 and 1.7

version 1.5, 2002/01/28 14:40:26 version 1.7, 2002/01/29 13:21:42
Line 214 
Line 214 
 [ AC_REQUIRE_CPP() [ AC_REQUIRE_CPP()
  
 chk_message_obj="$1" chk_message_obj="$1"
 nel_dir_lnk="$2" nel_libraries="$2"
 nel_libraries="$3" nel_test_lib="$3"
 nel_test_lib="$4" nel_additional_libs="$4"
 is_mandatory="$5" is_mandatory="$5"
  
 if test $is_mandatory = "yes" if test $is_mandatory = "yes"
Line 224 
Line 224 
  
     AC_MSG_CHECKING(for -l$nel_test_lib)     AC_MSG_CHECKING(for -l$nel_test_lib)
                  
     if test $nel_libraries     NEL_TEST_LIBS="$NEL_LIBS $nel_additional_libs -l$nel_test_lib"
     then 
         NEL_TEST_LIBS="-L$nel_libraries -l$nel_test_lib" 
  
     else 
         NEL_TEST_LIBS="$nel_dir_lnk -l$nel_test_lib" 
     fi 
  
     _CPPFLAGS="$CPPFLAGS"     _CPPFLAGS="$CPPFLAGS"
  
     CPPFLAGS="$CXXFLAGS $NEL_TEST_LIBS"     CPPFLAGS="$CXXFLAGS $LIBS $NEL_TEST_LIBS"
  
     AC_TRY_LINK( , , have_nel_test_libraries="yes", have_nel_test_libraries="no")     AC_TRY_LINK( , , have_nel_test_libraries="yes", have_nel_test_libraries="no")
  
Line 279 
Line 273 
 nel_net_lib="nelnet" nel_net_lib="nelnet"
 nel_3d_lib="nel3d" nel_3d_lib="nel3d"
 nel_pacs_lib="nelpacs" nel_pacs_lib="nelpacs"
 nel_sound_lib="nelsound" nel_sound_lib="nelsnd"
 nel_ai_lib="nelai" nel_ai_lib="nelai"
  
 nelmisc_is_mandatory="$1" nelmisc_is_mandatory="$1"
Line 289 
Line 283 
 nelsound_is_mandatory="$5" nelsound_is_mandatory="$5"
 nelai_is_mandatory="$6" nelai_is_mandatory="$6"
  
 nelconfig_libs_args="" 
  
 if test "$nelnet_is_mandatory" != "yes" 
 then 
     nelconfig_libs_args="$nelconfig_libs_args --without-network" 
 fi 
  
 if test "$nel3d_is_mandatory" != "yes" 
 then 
     nelconfig_libs_args="$nelconfig_libs_args --without-3d" 
 fi 
  
 if test "$nelpacs_is_mandatory" != "yes" 
 then 
     nelconfig_libs_args="$nelconfig_libs_args --without-pacs" 
 fi 
  
 if test "$nelsound_is_mandatory" != "yes" 
 then 
     nelconfig_libs_args="$nelconfig_libs_args --without-sound" 
 fi 
  
 if test "$nelai_is_mandatory" != "yes" 
 then 
     nelconfig_libs_args="$nelconfig_libs_args --without-ai" 
 fi 
  
 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 324 
Line 291 
     have_nel_config="no"     have_nel_config="no"
 else else
     NEL_CFLAGS=`nel-config --cflags`     NEL_CFLAGS=`nel-config --cflags`
     NEL_LIBS=`nel-config --libs $nelconfig_libs_args` 
  
     nel_dir_lnk=`echo '$NEL_LIBS' | sed -e 's/[[:space:]]*-l[^[:space:]]*//g'`     NEL_LIBS_CONFIG=`nel-config --libs`
  
      NEL_LIBS=`echo '$NEL_LIBS_CONFIG' | sed -e 's/[[:space:]]*-l[^[:space:]]*//g'`
  
     have_nel_config="yes"     have_nel_config="yes"
 fi fi
Line 366 
Line 334 
 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)
  
 dnl Checking for NeL libraries dnl Checking for NeL libraries
 MY_NEL_LIB_CHK([NeL Misc], $nel_dir_lnk, $nel_libraries, $nel_misc_lib, $nelmisc_is_mandatory) MY_NEL_LIB_CHK([NeL Misc], $nel_libraries, $nel_misc_lib, "", $nelmisc_is_mandatory)
 MY_NEL_LIB_CHK([NeL Network], $nel_dir_lnk, $nel_libraries, $nel_net_lib, $nelnet_is_mandatory) MY_NEL_LIB_CHK([NeL Network],$nel_libraries, $nel_net_lib, "-lnelmisc", $nelnet_is_mandatory)
 MY_NEL_LIB_CHK([NeL 3D], $nel_dir_lnk, $nel_libraries, $nel_3d_lib, $nel3d_is_mandatory) MY_NEL_LIB_CHK([NeL 3D], $nel_libraries, $nel_3d_lib, "-lnelmisc", $nel3d_is_mandatory)
 MY_NEL_LIB_CHK([NeL PACS], $nel_dir_lnk, $nel_libraries, $nel_pacs_lib, $nelpacs_is_mandatory) MY_NEL_LIB_CHK([NeL PACS], $nel_libraries, $nel_pacs_lib, "-lnelmisc", $nelpacs_is_mandatory)
 MY_NEL_LIB_CHK([NeL Sound], $nel_dir_lnk, $nel_libraries, $nel_sound_lib, $nelsound_is_mandatory) MY_NEL_LIB_CHK([NeL AI], $nel_libraries, $nel_ai_lib, "-lnelmisc", $nelai_is_mandatory)
 MY_NEL_LIB_CHK([NeL AI], $nel_dir_lnk, $nel_libraries, $nel_ai_lib, $nelai_is_mandatory) MY_NEL_LIB_CHK([NeL Sound], $nel_libraries, $nel_sound_lib, "-lnelmisc" $OPENAL_LIBS, $nelsound_is_mandatory)
  
 ]) ])
  
Line 409 
Line 377 
     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
  

Legend:
Removed from v.1.5 
changed lines
 Added in v.1.7