aboutsummaryrefslogtreecommitdiff
path: root/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.3&r2=1.6
diff options
context:
space:
mode:
Diffstat (limited to 'cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.3&r2=1.6')
-rw-r--r--cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.3&r2=1.688
1 files changed, 88 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.3&r2=1.6 b/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.3&r2=1.6
new file mode 100644
index 00000000..7326929d
--- /dev/null
+++ b/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.3&r2=1.6
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML>
+<HEAD><style> A { color:black }</style>
+<!-- hennerik CVSweb $Revision: 1.93 $ -->
+<TITLE>code/nelns/acinclude.m4 - diff - 1.6</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee">
+<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="#aaaaaa"><tr valign=bottom><td><a href="/cvs/cvsweb.cgi/code/nelns/acinclude.m4"><IMG SRC="http://www.nevrax.org/inc/img/picto-up.gif" ALT="[BACK]" BORDER="0" WIDTH="14" HEIGHT="13"></a> <b>Return to <A HREF="/cvs/cvsweb.cgi/code/nelns/acinclude.m4">acinclude.m4</A>
+ CVS log</b> <IMG SRC="http://www.nevrax.org/inc/img/picto-news.gif" ALT="[TXT]" BORDER="0" WIDTH="13" HEIGHT="15"></td><td align=right><IMG SRC="http://www.nevrax.org/inc/img/picto-dir.gif" ALT="[DIR]" BORDER="0" WIDTH="15" HEIGHT="13"> <b>Up to <a href="/cvs/cvsweb.cgi/">Nevrax</a> / <a href="/cvs/cvsweb.cgi/code/">code</a> / <a href="/cvs/cvsweb.cgi/code/nelns/">nelns</a></b></td></tr></table><h3 align=center>Diff for /code/nelns/acinclude.m4 between version 1.3 and 1.6</h3>
+<table border=0 cellspacing=0 cellpadding=0 width="100%">
+<tr bgcolor="#ffffff">
+<th width="50%" valign=TOP>version 1.3, 2002/01/10 14:33:19</th>
+<th width="50%" valign=TOP>version 1.6, 2002/01/28 14:59:45</th>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 64</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 64</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl &nbsp; &nbsp;Option: &nbsp; &nbsp; &nbsp;&quot;yes&quot; if the use of the OpenAL library is mandatory.</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl &nbsp; &nbsp;Option: &nbsp; &nbsp; &nbsp;&quot;yes&quot; if the use of the OpenAL library is mandatory.</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl &nbsp; &nbsp;Description: check the instalation of the OpenGL library and set the</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl &nbsp; &nbsp;Description: check the instalation of the OpenGL library and set the</font></td></tr>
+<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;dnl &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; OPENAL_CFLAGS and OPENAL_LIB variables to use it.</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;dnl &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; OPENAL_CFLAGS and OPENAL_LIBS variables to use it.</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl AM_PATH_PYTHON</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl AM_PATH_PYTHON</font></td></tr>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 226</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 226</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;if test $nel_libraries</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;if test $nel_libraries</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;then</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;then</font></td></tr>
+<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;NEL_TEST_LIB=&quot;-L$nel_libraries -l$nel_test_lib&quot;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;NEL_TEST_LIBS=&quot;-L$nel_libraries -l$nel_test_lib&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;else</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;else</font></td></tr>
+<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;NEL_TEST_LIB=&quot;$nel_dir_lnk -l$nel_test_lib&quot;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;NEL_TEST_LIBS=&quot;$nel_dir_lnk -l$nel_test_lib&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;fi</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;fi</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;_CPPFLAGS=&quot;$CPPFLAGS&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;_CPPFLAGS=&quot;$CPPFLAGS&quot;</font></td></tr>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 352</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 352</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;NEL_CFLAGS=&quot;-I$nel_includes&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;NEL_CFLAGS=&quot;-I$nel_includes&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp;if test &quot;$nel_libraries&quot;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp;then</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;NEL_LIBS=&quot;-L$nel_libraries&quot;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl Checking for NeL headers</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl Checking for NeL headers</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)</font></td></tr>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 404</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 409</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;then</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;then</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;stlport_includes=&quot;$with_stlport/stlport&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;stlport_includes=&quot;$with_stlport/stlport&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;stlport_libraries=&quot;$with_stlport/lib&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;stlport_libraries=&quot;$with_stlport/lib&quot;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if test ! -d &quot;$stlport_includes&quot;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;then</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;stlport_includes=&quot;$with_stlport/include/stlport&quot;</font></td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;</td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fi</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;fi</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;fi</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 876</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 886</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;then</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;then</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;OPENAL_LIBS=&quot;-L$openal_libraries&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp; &nbsp; &nbsp;OPENAL_LIBS=&quot;-L$openal_libraries&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td></tr>
+<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;OPENAL_LIB=&quot;$OPENAL_LIB -l$openal_lib&quot;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;OPENAL_LIBS=&quot;$OPENAL_LIBS -l$openal_lib&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;_CPPFLAGS=&quot;$CPPFLAGS&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;_CPPFLAGS=&quot;$CPPFLAGS&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;CPPFLAGS=&quot;$CXXFLAGS $OPENAL_CFLAGS&quot;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;CPPFLAGS=&quot;$CXXFLAGS $OPENAL_CFLAGS&quot;</font></td></tr>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 905</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 915</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl Test the libraries</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;dnl Test the libraries</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;AC_MSG_CHECKING(for OpenAL libraries)</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;AC_MSG_CHECKING(for OpenAL libraries)</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;CPPFLAGS=&quot;$CXXFLAGS $OPENAL_LIB&quot;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;CPPFLAGS=&quot;$CXXFLAGS $OPENAL_LIBS&quot;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;AC_TRY_LINK( , , have_openal_libraries=&quot;yes&quot;, have_openal_libraries=&quot;no&quot;)</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;AC_TRY_LINK( , , have_openal_libraries=&quot;yes&quot;, have_openal_libraries=&quot;no&quot;)</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 939</b>&nbsp;<font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 949</b>&nbsp;<font size=-1></font></td></tr></table></td>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;fi</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;AC_SUBST(OPENAL_CFLAGS)</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;AC_SUBST(OPENAL_CFLAGS)</font></td></tr>
+<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;AC_SUBST(OPENAL_LIB)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1">&nbsp;AC_SUBST(OPENAL_LIBS)</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;</font></td></tr>
+<tr><td><font face="Helvetica,Arial" size="-1">&nbsp;])</font></td><td><font face="Helvetica,Arial" size="-1">&nbsp;])</font></td></tr>
+</table><br><hr noshade width="100%">
+<table border=0><tr><td><table border=1><tr><td>Legend:<br><table border=0 cellspacing=0 cellpadding=1>
+<tr><td align=center bgcolor="#ff9999">Removed from v.1.3</td><td bgcolor="#cccccc">&nbsp;</td></tr><tr bgcolor="#99ff99"><td align=center colspan=2>changed lines</td></tr><tr><td bgcolor="#cccccc">&nbsp;</td><td align=center bgcolor="#ccccff">Added in v.1.6</td></tr></table></td></tr></table>
+<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff">
+<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.3">
+<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.6">
+<SELECT NAME="f" onchange="submit()">
+<OPTION VALUE=h SELECTED>Colored Diff<OPTION VALUE=H>Long Colored Diff<OPTION VALUE=u>Unidiff<OPTION VALUE=c>Context Diff<OPTION VALUE=s>Side by Side</SELECT><INPUT TYPE=SUBMIT VALUE="Show">
+</FORM>
+</td></tr></table> \ No newline at end of file