diff options
Diffstat (limited to 'cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.9&r2=1.12')
| -rw-r--r-- | cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.9&r2=1.12 | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.9&r2=1.12 b/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.9&r2=1.12 new file mode 100644 index 00000000..4757e557 --- /dev/null +++ b/cvs/cvsweb.cgi/code/nelns/acinclude.m4.diff?r1=1.9&r2=1.12 @@ -0,0 +1,72 @@ +<!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.12</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.9 and 1.12</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.9, 2002/03/19 17:42:48</th> +<th width="50%" valign=TOP>version 1.12, 2002/03/29 10:19:10</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 237</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 237</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( nel-include,</font></td><td><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( nel-include,</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ --with-nel-include=<path></font></td><td><font face="Helvetica,Arial" size="-1"> [ --with-nel-include=<path></font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> path to the NeL header files directory.</font></td><td><font face="Helvetica,Arial" size="-1"> path to the NeL header files directory.</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/nel/stlport])</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/nel/include])</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( nel-lib,</font></td><td><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( nel-lib,</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ --with-nel-lib=<path></font></td><td><font face="Helvetica,Arial" size="-1"> [ --with-nel-lib=<path></font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 251</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 251</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> nelpacs_is_mandatory="$4"</font></td><td><font face="Helvetica,Arial" size="-1"> nelpacs_is_mandatory="$4"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nelsound_is_mandatory="$5"</font></td><td><font face="Helvetica,Arial" size="-1"> nelsound_is_mandatory="$5"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nelai_is_mandatory="$6"</font></td><td><font face="Helvetica,Arial" size="-1"> nelai_is_mandatory="$6"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> nelgeorges_is_mandatory="$7"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl Check for nel-config</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Check for nel-config</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_PATH_PROG(NEL_CONFIG, nel-config, no)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_PATH_PROG(NEL_CONFIG, nel-config, no)</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 325</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 326</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl</font></td><td><font face="Helvetica,Arial" size="-1"> dnl</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl Collect libraries information and bark if missing and</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Collect libraries information and bark if missing and</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 335</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 337</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)</font></td><td><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> ])</font></td><td><font face="Helvetica,Arial" size="-1"> ])</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 659</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 662</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl Checking the FreeType 2 instalation</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Checking the FreeType 2 instalation</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> _CPPFLAGS="$CPPFLAGS"</font></td><td><font face="Helvetica,Arial" size="-1"> _CPPFLAGS="$CPPFLAGS"</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_MSG_CHECKING(for FreeType version = 2)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_MSG_CHECKING(for FreeType version = 2)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 686</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 689</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"</font></td><td><font face="Helvetica,Arial" size="-1"> FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> fi</font></td><td><font face="Helvetica,Arial" size="-1"> fi</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$CXXFLAGS $FREETYPE_LIBS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")</font></td><td><font face="Helvetica,Arial" size="-1"> AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </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.9</td><td bgcolor="#cccccc"> </td></tr><tr bgcolor="#99ff99"><td align=center colspan=2>changed lines</td></tr><tr><td bgcolor="#cccccc"> </td><td align=center bgcolor="#ccccff">Added in v.1.12</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.9"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.12"> +<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 |