diff options
Diffstat (limited to 'cvs/cvsweb.cgi/code/snowballs2/configure.in.diff?r1=1.3&r2=1.4')
| -rw-r--r-- | cvs/cvsweb.cgi/code/snowballs2/configure.in.diff?r1=1.3&r2=1.4 | 195 |
1 files changed, 195 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/snowballs2/configure.in.diff?r1=1.3&r2=1.4 b/cvs/cvsweb.cgi/code/snowballs2/configure.in.diff?r1=1.3&r2=1.4 new file mode 100644 index 00000000..452985ad --- /dev/null +++ b/cvs/cvsweb.cgi/code/snowballs2/configure.in.diff?r1=1.3&r2=1.4 @@ -0,0 +1,195 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML> +<HEAD><style> A { color:black }</style> +<!-- hennerik CVSweb $Revision: 1.93 $ --> +<TITLE>code/snowballs2/configure.in - diff - 1.4</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/snowballs2/configure.in"><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/snowballs2/configure.in">configure.in</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/snowballs2/">snowballs2</a></b></td></tr></table><h3 align=center>Diff for /code/snowballs2/configure.in between version 1.3 and 1.4</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.3, 2001/07/23 13:30:41</th> +<th width="50%" valign=TOP>version 1.4, 2001/08/07 14:19:53</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 12</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 12</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_INIT(client/src/client.cpp)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_INIT(client/src/client.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"> MAJOR_VERSION=0</font></td><td><font face="Helvetica,Arial" size="-1"> MAJOR_VERSION=0</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MINOR_VERSION=1</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> MINOR_VERSION=2</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> PICO_VERSION=0</font></td><td><font face="Helvetica,Arial" size="-1"> PICO_VERSION=0</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"> AM_INIT_AUTOMAKE(snowballs, $MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION)</font></td><td><font face="Helvetica,Arial" size="-1"> AM_INIT_AUTOMAKE(snowballs, $MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION)</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 35</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 35</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_ARG_ENABLE( client,</font></td><td><font face="Helvetica,Arial" size="-1"> AC_ARG_ENABLE( client,</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ --disable-client disable compilation and install of Snowballs Client.],</font></td><td><font face="Helvetica,Arial" size="-1"> [ --disable-client disable compilation and install of Snowballs Client.],</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(disable Snowballs Client.) ],</font></td><td><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(disable Snowballs Client.) ],</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ SNO_SUBDIRS="$SNO_SUBDIRS client" ] )</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ SNO_SUBDIRS="$SNO_SUBDIRS client"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> enable_client=yes ] )</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 Server</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Server</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_ARG_ENABLE( server,</font></td><td><font face="Helvetica,Arial" size="-1"> AC_ARG_ENABLE( server,</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ --disable-server disable compilation and install of Snowballs Server.],</font></td><td><font face="Helvetica,Arial" size="-1"> [ --disable-server disable compilation and install of Snowballs Server.],</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(disable Snowballs Server.) ],</font></td><td><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(disable Snowballs Server.) ],</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ SNO_SUBDIRS="$SNO_SUBDIRS server" ] )</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ SNO_SUBDIRS="$SNO_SUBDIRS server"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> enable_server=yes ] )</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_SUBST(SNO_SUBDIRS)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_SUBST(SNO_SUBDIRS)</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 95</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 97</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> CXXFLAGS="$CXXFLAGS -I$x_includes"</font></td><td><font face="Helvetica,Arial" size="-1"> CXXFLAGS="$CXXFLAGS -I$x_includes"</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"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if test "$enable_client" = "yes"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR(X11 must be installed.)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR(X11 must be installed.)</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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><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><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 STLPort</font></td><td><font face="Helvetica,Arial" size="-1"> dnl STLPort</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"> dnl Ask user for path to the STLport header files</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> dnl Ask user for path to the STLport files location</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( stlport,</font></td><td><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( stlport,</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ --with-stlport=<path> path to the STLPort header files directory.</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ --with-stlport=<path> path to the STLPort install files directory.</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/include/stlport ],</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/stlport] </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ STLPORT_DIR=$with_stlport</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(using STLPort header files located in $with_stlport) ],</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([You must call configure with the --with-stlport option.</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> This tells configure where to find the STLPort header files.</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. --with-stlport=/usr/local/include/stlport])</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"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test X"$STLPORT_DIR" != X"";</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( stlport-include,</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ --with-stlport-include=<path></font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> path to the STLPort header files directory.</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> fi</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/stlport/include] </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> dnl Ask user for path to the STLPort library files</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( stlport-lib,</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_ARG_WITH( stllib,</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ --with-stlport-lib=<path></font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ --with-stllib=<path> path to the STLPort installation directory.</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> path to the STLPort library files directory.</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/lib/stlport],</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> e.g. /usr/local/stlport/lib]</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ STLLIB_DIR=$with_stllib</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(using STLPort library located in $with_stllib) ]</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"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test X"$STLLIB_DIR" != X"";</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test "$with_stlport" != "no"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test -z "$with_stlport" && test -z "$with_stlport_lib" -o -z "$with_stlport_include"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> then</font></td><td><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> LIBS="-L$STLLIB_DIR $LIBS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([You must call configure with the --with-stlport or --with-stlport-lib and with-stlport-include options.</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> This tells configure where to find the STLPort files.])</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"> LIBS="$LIBS -lstlport_gcc"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test $with_stlport</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(using STLPort files located in $with_stlport)</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="$CPPFLAGS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> STLPORT_CFLAGS="$with_stlport/include"</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$CXXFLAGS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> STLPORT_LIB="$with_stlport/lib"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> fi</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> no_stlport="no"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(*** Override the use of the STLPorts (EXPERIMENTAL) ***)</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><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"> AC_MSG_CHECKING(for STLPort)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test -z "$no_stlport" -a "$with_stlport_include"</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_EGREP_CPP( yo_stlport,</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [#include <algorithm></font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(using STLPort header files located in $with_stlport_include)</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> #ifdef __SGI_STL_PORT</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> STLPORT_CFLAGS="$with_stlport_include"</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> yo_stlport</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> fi</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> #endif],</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(yes)],</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([STLPort is needed to compile the client (www.stlport.org)])</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><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="$_CPPFLAGS"</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test -z "$no_stlport" -a "$with_stlport_lib"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(using STLPort library files located in $with_stlport_lib)</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> STLPORT_LIB="$with_stlport_lib"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><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><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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 177</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 186</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl Check for the FreeType 2 library files</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Check for the FreeType 2 library files</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)</font></td><td><font face="Helvetica,Arial" size="-1"> AC_PATH_PROG(FREETYPE_CONFIG, freetype-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><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test "$FREETYPE_CONFIG" = "no"; then</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test "$FREETYPE_CONFIG" = "no" -a "$enable_client" = "yes"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([Cannot find freetype-config: check your path.</font></td><td><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([Cannot find freetype-config: check your path.</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> FreeType 2 library is needed to compile NeL (freetype.sourceforge.net).])</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> FreeType 2 library is needed to compile Snowballs (freetype.sourceforge.net).])</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"> FREETYPE_CFLAGS=`freetype-config --cflags`</font></td><td><font face="Helvetica,Arial" size="-1"> FREETYPE_CFLAGS=`freetype-config --cflags`</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> FREETYPE_LIBS=`freetype-config --libs`</font></td><td><font face="Helvetica,Arial" size="-1"> FREETYPE_LIBS=`freetype-config --libs`</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 199</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 209</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> yo_freetype2</font></td><td><font face="Helvetica,Arial" size="-1"> yo_freetype2</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> #endif],</font></td><td><font face="Helvetica,Arial" size="-1"> #endif],</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(yes)],</font></td><td><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(yes)],</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([Freetype 2 library is needed to compile NeL (freetype.sourceforge.net).])</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if test "$enable_client" = "yes"</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([Freetype 2 library is needed to compile Snowballs (freetype.sourceforge.net).])</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> AC_MSG_RESULT(no)</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><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><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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 259</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 274</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 ==========================================================================</font></td><td><font face="Helvetica,Arial" size="-1"> dnl ==========================================================================</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl Checks for libraries.</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Checks for libraries.</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> dnl ==========================================================================</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> dnl ==========================================================================</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> dnl STLPort</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if test -z "$no_stlport"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> then </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if test X"$STLPORT_CFLAGS" != X</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CXXFLAGS="-I$STLPORT_CFLAGS $CXXFLAGS"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> fi</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if test X"$STLPORT_LIB" != X</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> then</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> LIBS="-L$STLPORT_LIB $LIBS -lstlport_gcc"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> fi</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> _CPPFLAGS="$CPPFLAGS"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$CXXFLAGS $STLPORT_CFLAGS"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> AC_MSG_CHECKING(for STLPort)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> AC_EGREP_CPP( yo_stlport,</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> [#include <algorithm></font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> #ifdef __SGI_STL_PORT</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> yo_stlport</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> #endif],</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> [ AC_MSG_RESULT(yes)],</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> AC_MSG_ERROR([STLPort is needed to compile Snowballs (www.stlport.org).]) )</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CPPFLAGS="$_CPPFLAGS"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><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><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 Checks for library functions.</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Checks for library functions.</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> dnl ==========================================================================</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"> dnl ==========================================================================</font></td><td><font face="Helvetica,Arial" size="-1"> dnl ==========================================================================</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> dnl Output files to generate.</font></td><td><font face="Helvetica,Arial" size="-1"> dnl Output files to generate.</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> dnl ==========================================================================</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_OUTPUT( Makefile \</font></td><td><font face="Helvetica,Arial" size="-1"> AC_OUTPUT( Makefile \</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> client/Makefile \</font></td><td><font face="Helvetica,Arial" size="-1"> client/Makefile \</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"> </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.4</td></tr></table></td></tr></table> +<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/snowballs2/configure.in.diff"> +<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.3"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.4"> +<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 |