1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML>
<HEAD><style> A { color:black }</style>
<!-- hennerik CVSweb $Revision: 1.93 $ -->
<TITLE>code/acinclude.m4 - diff - 1.7</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/acinclude.m4"><IMG SRC="/inc/img/picto-up.gif" ALT="[BACK]" BORDER="0" WIDTH="14" HEIGHT="13"></a> <b>Return to <A HREF="/cvs/cvsweb.cgi/code/acinclude.m4">acinclude.m4</A>
CVS log</b> <IMG SRC="/inc/img/picto-news.gif" ALT="[TXT]" BORDER="0" WIDTH="13" HEIGHT="15"></td><td align=right><IMG SRC="/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></b></td></tr></table><h3 align=center>Diff for /code/acinclude.m4 between version 1.6 and 1.7</h3>
<table border=0 cellspacing=0 cellpadding=0 width="100%">
<tr bgcolor="#ffffff">
<th width="50%" valign=TOP>version 1.6, 2002/01/28 14:59:45</th>
<th width="50%" valign=TOP>version 1.7, 2002/01/29 13:21:42</th>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 214</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 214</b> <font size=-1></font></td></tr></table></td>
<tr><td><font face="Helvetica,Arial" size="-1"> [ AC_REQUIRE_CPP()</font></td><td><font face="Helvetica,Arial" size="-1"> [ AC_REQUIRE_CPP()</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"> chk_message_obj="$1"</font></td><td><font face="Helvetica,Arial" size="-1"> chk_message_obj="$1"</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_dir_lnk="$2"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_libraries="$2"</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_libraries="$3"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_test_lib="$3"</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_test_lib="$4"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_additional_libs="$4"</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> is_mandatory="$5"</font></td><td><font face="Helvetica,Arial" size="-1"> is_mandatory="$5"</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"> if test $is_mandatory = "yes"</font></td><td><font face="Helvetica,Arial" size="-1"> if test $is_mandatory = "yes"</font></td></tr>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 224</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 224</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"> AC_MSG_CHECKING(for -l$nel_test_lib)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_MSG_CHECKING(for -l$nel_test_lib)</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"> if test $nel_libraries</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NEL_TEST_LIBS="$NEL_LIBS $nel_additional_libs -l$nel_test_lib"</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#99cc99"> </td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NEL_TEST_LIBS="-L$nel_libraries -l$nel_test_lib"</font></td><td bgcolor="#99cc99"> </td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#99cc99"> </td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td><td bgcolor="#99cc99"> </td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NEL_TEST_LIBS="$nel_dir_lnk -l$nel_test_lib"</font></td><td bgcolor="#99cc99"> </td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#99cc99"> </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"> _CPPFLAGS="$CPPFLAGS"</font></td><td><font face="Helvetica,Arial" size="-1"> _CPPFLAGS="$CPPFLAGS"</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 $NEL_TEST_LIBS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$CXXFLAGS $LIBS $NEL_TEST_LIBS"</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_nel_test_libraries="yes", have_nel_test_libraries="no")</font></td><td><font face="Helvetica,Arial" size="-1"> AC_TRY_LINK( , , have_nel_test_libraries="yes", have_nel_test_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>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 279</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 273</b> <font size=-1></font></td></tr></table></td>
<tr><td><font face="Helvetica,Arial" size="-1"> nel_net_lib="nelnet"</font></td><td><font face="Helvetica,Arial" size="-1"> nel_net_lib="nelnet"</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> nel_3d_lib="nel3d"</font></td><td><font face="Helvetica,Arial" size="-1"> nel_3d_lib="nel3d"</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> nel_pacs_lib="nelpacs"</font></td><td><font face="Helvetica,Arial" size="-1"> nel_pacs_lib="nelpacs"</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_sound_lib="nelsound"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nel_sound_lib="nelsnd"</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> nel_ai_lib="nelai"</font></td><td><font face="Helvetica,Arial" size="-1"> nel_ai_lib="nelai"</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"> nelmisc_is_mandatory="$1"</font></td><td><font face="Helvetica,Arial" size="-1"> nelmisc_is_mandatory="$1"</font></td></tr>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 289</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 283</b> <font size=-1></font></td></tr></table></td>
<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><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nelconfig_libs_args=""</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if test "$nelnet_is_mandatory" != "yes"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nelconfig_libs_args="$nelconfig_libs_args --without-network"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if test "$nel3d_is_mandatory" != "yes"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nelconfig_libs_args="$nelconfig_libs_args --without-3d"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if test "$nelpacs_is_mandatory" != "yes"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nelconfig_libs_args="$nelconfig_libs_args --without-pacs"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if test "$nelsound_is_mandatory" != "yes"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nelconfig_libs_args="$nelconfig_libs_args --without-sound"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if test "$nelai_is_mandatory" != "yes"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nelconfig_libs_args="$nelconfig_libs_args --without-ai"</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#cccccc"> </td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </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><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 324</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 291</b> <font size=-1></font></td></tr></table></td>
<tr><td><font face="Helvetica,Arial" size="-1"> have_nel_config="no"</font></td><td><font face="Helvetica,Arial" size="-1"> have_nel_config="no"</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> NEL_CFLAGS=`nel-config --cflags`</font></td><td><font face="Helvetica,Arial" size="-1"> NEL_CFLAGS=`nel-config --cflags`</font></td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> NEL_LIBS=`nel-config --libs $nelconfig_libs_args`</font></td><td bgcolor="#cccccc"> </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"> nel_dir_lnk=`echo '$NEL_LIBS' | sed -e 's/[[:space:]]*-l[^[:space:]]*//g'`</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NEL_LIBS_CONFIG=`nel-config --libs`</font></td></tr>
<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr>
<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NEL_LIBS=`echo '$NEL_LIBS_CONFIG' | sed -e 's/[[:space:]]*-l[^[:space:]]*//g'`</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"> have_nel_config="yes"</font></td><td><font face="Helvetica,Arial" size="-1"> have_nel_config="yes"</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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 366</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 334</b> <font size=-1></font></td></tr></table></td>
<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><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 for NeL libraries</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Checking for NeL libraries</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Misc], $nel_dir_lnk, $nel_libraries, $nel_misc_lib, $nelmisc_is_mandatory)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Misc], $nel_libraries, $nel_misc_lib, "", $nelmisc_is_mandatory)</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Network], $nel_dir_lnk, $nel_libraries, $nel_net_lib, $nelnet_is_mandatory)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Network],$nel_libraries, $nel_net_lib, "-lnelmisc", $nelnet_is_mandatory)</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL 3D], $nel_dir_lnk, $nel_libraries, $nel_3d_lib, $nel3d_is_mandatory)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL 3D], $nel_libraries, $nel_3d_lib, "-lnelmisc", $nel3d_is_mandatory)</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL PACS], $nel_dir_lnk, $nel_libraries, $nel_pacs_lib, $nelpacs_is_mandatory)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL PACS], $nel_libraries, $nel_pacs_lib, "-lnelmisc", $nelpacs_is_mandatory)</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Sound], $nel_dir_lnk, $nel_libraries, $nel_sound_lib, $nelsound_is_mandatory)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL AI], $nel_libraries, $nel_ai_lib, "-lnelmisc", $nelai_is_mandatory)</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL AI], $nel_dir_lnk, $nel_libraries, $nel_ai_lib, $nelai_is_mandatory)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MY_NEL_LIB_CHK([NeL Sound], $nel_libraries, $nel_sound_lib, "-lnelmisc" $OPENAL_LIBS, $nelsound_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>
</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.6</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.7</td></tr></table></td></tr></table>
<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/acinclude.m4.diff">
<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.7">
<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>
|
