From kwaclaw at users.sourceforge.net Sun Jan 1 19:49:31 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 1 Jan 2006 19:49:31 +0100 (CET)
Subject: [Expat-checkins] expat README,1.30,1.31
Message-ID: <20060101184931.4A63E1E4002@bag.python.org>
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1822
Modified Files:
README
Log Message:
Small corrections.
Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- README 28 Dec 2005 18:41:57 -0000 1.30
+++ README 1 Jan 2006 18:49:25 -0000 1.31
@@ -1,5 +1,5 @@
- Expat, Release 2.0
+ Expat, Release 2.0.0
This is Expat, a C library for parsing XML, written by James Clark.
Expat is a stream-oriented XML parser. This means that you register
@@ -9,7 +9,7 @@
structures for which you may register handlers.
Windows users should use the expat_win32bin package, which includes
-both precompiled libraries and executalbes, and source code for
+both precompiled libraries and executables, and source code for
developers.
Expat is free software. You may copy, distribute, and modify it under
@@ -50,7 +50,7 @@
./configure --prefix=/home/me/mystuff
Another interesting option is to enable 64-bit integer support for
-line- and column numbers and the over-all byte index:
+line and column numbers and the over-all byte index:
./configure CPPFLAGS=-DXML_LARGE_SIZE
From kwaclaw at users.sourceforge.net Sun Jan 1 19:53:49 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 1 Jan 2006 19:53:49 +0100 (CET)
Subject: [Expat-checkins] expat/tests/benchmark README.txt,1.2,1.3
Message-ID: <20060101185349.1C5EB1E4002@bag.python.org>
Update of /cvsroot/expat/expat/tests/benchmark
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2900
Modified Files:
README.txt
Log Message:
Small corrections.
Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/tests/benchmark/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.txt 5 Sep 2003 00:42:46 -0000 1.2
+++ README.txt 1 Jan 2006 18:53:44 -0000 1.3
@@ -4,7 +4,7 @@
The command line arguments are:
- -n ... optional; if supplied, then namespace processing is turned on
+ -n ... optional; if supplied, namespace processing is turned on
... name/path of test xml file
... size of processing buffer;
the file is parsed in chunks of this size
@@ -13,4 +13,4 @@
Returns:
The time (in seconds) it takes to parse the test file,
- averaged of the number of iterations.
\ No newline at end of file
+ averaged over the number of iterations.
\ No newline at end of file
From kwaclaw at users.sourceforge.net Sun Jan 1 21:59:31 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 1 Jan 2006 21:59:31 +0100 (CET)
Subject: [Expat-checkins] expat/win32 expat.iss,1.19,1.20
Message-ID: <20060101205931.9698E1E4002@bag.python.org>
Update of /cvsroot/expat/expat/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24018
Modified Files:
expat.iss
Log Message:
Fixed some file references and updated to InnoSetup 5.1.6.
Index: expat.iss
===================================================================
RCS file: /cvsroot/expat/expat/win32/expat.iss,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- expat.iss 29 Jan 2005 05:00:15 -0000 1.19
+++ expat.iss 1 Jan 2006 20:59:25 -0000 1.20
@@ -1,4 +1,4 @@
-; Basic setup script for the Inno Setep installer builder. For more
+; Basic setup script for the Inno Setup installer builder. For more
; information on the free installer builder, see www.jrsoftware.org.
;
; This script was contributed by Tim Peters.
@@ -7,15 +7,15 @@
[Setup]
AppName=expat
AppId=expat
-AppVersion=1.95.8
-AppVerName=expat 1.95.8
-AppCopyright=Copyright © 1998-2003 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
-DefaultDirName={sd}\Expat-1.95.8
+AppVersion=2.0.0
+AppVerName=expat 2.0.0
+AppCopyright=Copyright © 1998-2006 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
+DefaultDirName={sd}\Expat-2.0.0
AppPublisher=The Expat Developers
AppPublisherURL=http://www.libexpat.org/
AppSupportURL=http://www.libexpat.org/
AppUpdatesURL=http://www.libexpat.org/
-UninstallDisplayName=Expat XML Parser (version 1.95.8)
+UninstallDisplayName=Expat XML Parser (version 2.0.0)
UninstallFilesDir={app}\Uninstall
Compression=bzip/9
@@ -27,36 +27,43 @@
DisableReadyPage=yes
[Files]
-CopyMode: alwaysoverwrite; Source: xmlwf\Release\*.exe; DestDir: "{app}"
-CopyMode: alwaysoverwrite; Source: win32\MANIFEST.txt; DestDir: "{app}"
-CopyMode: alwaysoverwrite; Source: Changes; DestDir: "{app}"; DestName: Changes.txt
-CopyMode: alwaysoverwrite; Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt
-CopyMode: alwaysoverwrite; Source: README; DestDir: "{app}"; DestName: README.txt
-CopyMode: alwaysoverwrite; Source: doc\*.html; DestDir: "{app}\Doc"
-CopyMode: alwaysoverwrite; Source: doc\*.css; DestDir: "{app}\Doc"
-CopyMode: alwaysoverwrite; Source: doc\*.png; DestDir: "{app}\Doc"
-CopyMode: alwaysoverwrite; Source: lib\Release\*.dll; DestDir: "{app}\Libs"
-CopyMode: alwaysoverwrite; Source: lib\Release\*.lib; DestDir: "{app}\Libs"
-CopyMode: alwaysoverwrite; Source: lib\Release-w\*.dll; DestDir: "{app}\Libs"
-CopyMode: alwaysoverwrite; Source: lib\Release-w\*.lib; DestDir: "{app}\Libs"
-CopyMode: alwaysoverwrite; Source: lib\Release_static\*.lib; DestDir: "{app}\StaticLibs"
-CopyMode: alwaysoverwrite; Source: lib\Release-w_static\*.lib; DestDir: "{app}\StaticLibs"
-CopyMode: alwaysoverwrite; Source: expat.dsw; DestDir: "{app}\Source"
-CopyMode: alwaysoverwrite; Source: win32\README.txt; DestDir: "{app}\Source"
-CopyMode: alwaysoverwrite; Source: bcb5\*.*; DestDir: "{app}\Source\bcb5"
-CopyMode: alwaysoverwrite; Source: lib\*.c; DestDir: "{app}\Source\lib"
-CopyMode: alwaysoverwrite; Source: lib\*.h; DestDir: "{app}\Source\lib"
-CopyMode: alwaysoverwrite; Source: lib\*.def; DestDir: "{app}\Source\lib"
-CopyMode: alwaysoverwrite; Source: lib\*.dsp; DestDir: "{app}\Source\lib"
-CopyMode: alwaysoverwrite; Source: examples\*.c; DestDir: "{app}\Source\examples"
-CopyMode: alwaysoverwrite; Source: examples\*.dsp; DestDir: "{app}\Source\examples"
-CopyMode: alwaysoverwrite; Source: tests\*.c; DestDir: "{app}\Source\tests"
-CopyMode: alwaysoverwrite; Source: tests\*.cpp; DestDir: "{app}\Source\tests"
-CopyMode: alwaysoverwrite; Source: tests\*.h; DestDir: "{app}\Source\tests"
-CopyMode: alwaysoverwrite; Source: tests\README.txt; DestDir: "{app}\Source\tests"
-CopyMode: alwaysoverwrite; Source: xmlwf\*.c*; DestDir: "{app}\Source\xmlwf"
-CopyMode: alwaysoverwrite; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf"
-CopyMode: alwaysoverwrite; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf"
+Flags: ignoreversion; Source: xmlwf\Release\*.exe; DestDir: "{app}"
+Flags: ignoreversion; Source: win32\MANIFEST.txt; DestDir: "{app}"
+Flags: ignoreversion; Source: Changes; DestDir: "{app}"; DestName: Changes.txt
+Flags: ignoreversion; Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt
+Flags: ignoreversion; Source: README; DestDir: "{app}"; DestName: README.txt
+Flags: ignoreversion; Source: doc\*.html; DestDir: "{app}\Doc"
+Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc"
+Flags: ignoreversion; Source: doc\*.png; DestDir: "{app}\Doc"
+Flags: ignoreversion; Source: lib\Release\*.dll; DestDir: "{app}\Libs"
+Flags: ignoreversion; Source: lib\Release\*.lib; DestDir: "{app}\Libs"
+Flags: ignoreversion; Source: lib\Release-w\*.dll; DestDir: "{app}\Libs"
+Flags: ignoreversion; Source: lib\Release-w\*.lib; DestDir: "{app}\Libs"
+Flags: ignoreversion; Source: lib\Release_static\*.lib; DestDir: "{app}\StaticLibs"
+Flags: ignoreversion; Source: lib\Release-w_static\*.lib; DestDir: "{app}\StaticLibs"
+Flags: ignoreversion; Source: expat.dsw; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: bcb5\*.bp*; DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.mak; DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.def; DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.txt; DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.bat; DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: lib\*.c; DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: lib\*.h; DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: lib\*.def; DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: lib\*.dsp; DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: examples\*.c; DestDir: "{app}\Source\examples"
+Flags: ignoreversion; Source: examples\*.dsp; DestDir: "{app}\Source\examples"
+Flags: ignoreversion; Source: tests\*.c; DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\*.cpp; DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\*.h; DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\README.txt; DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\benchmark\*.c; DestDir: "{app}\Source\tests\benchmark"
+Flags: ignoreversion; Source: tests\benchmark\*.ds*; DestDir: "{app}\Source\tests\benchmark"
+Flags: ignoreversion; Source: tests\benchmark\README.txt; DestDir: "{app}\Source\tests\benchmark"
+Flags: ignoreversion; Source: xmlwf\*.c*; DestDir: "{app}\Source\xmlwf"
+Flags: ignoreversion; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf"
+Flags: ignoreversion; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf"
[Messages]
WelcomeLabel1=Welcome to the Expat XML Parser Setup Wizard
From kwaclaw at users.sourceforge.net Sun Jan 1 22:17:46 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 1 Jan 2006 22:17:46 +0100 (CET)
Subject: [Expat-checkins] expat/tests/benchmark benchmark.c,1.2,1.3
Message-ID: <20060101211746.5A0DB1E4002@bag.python.org>
Update of /cvsroot/expat/expat/tests/benchmark
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26631
Modified Files:
benchmark.c
Log Message:
Added support for XML_LARGE_SIZE.
Index: benchmark.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/benchmark/benchmark.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- benchmark.c 24 Dec 2005 06:34:24 -0000 1.2
+++ benchmark.c 1 Jan 2006 21:17:41 -0000 1.3
@@ -4,6 +4,12 @@
#include
#include "expat.h"
+#ifdef XML_LARGE_SIZE
+#define XML_FMT_INT_MOD "ll"
+#else
+#define XML_FMT_INT_MOD "l"
+#endif
+
static void
usage(const char *prog, int rc)
{
@@ -83,7 +89,8 @@
else
parseBufferSize = bufferSize;
if (!XML_Parse (parser, XMLBufPtr, parseBufferSize, isFinal)) {
- fprintf (stderr, "error '%s' at line %d character %d\n",
+ fprintf (stderr, "error '%s' at line %" XML_FMT_INT_MOD \
+ "u character %" XML_FMT_INT_MOD "u\n",
XML_ErrorString (XML_GetErrorCode (parser)),
XML_GetCurrentLineNumber (parser),
XML_GetCurrentColumnNumber (parser));
From kwaclaw at users.sourceforge.net Fri Jan 6 04:59:12 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 6 Jan 2006 04:59:12 +0100 (CET)
Subject: [Expat-checkins] expat Changes,1.46,1.47
Message-ID: <20060106035912.C4B4C1E4002@bag.python.org>
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20582
Modified Files:
Changes
Log Message:
Prepared for release 2.0.0.
Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Changes 23 Dec 2005 14:45:27 -0000 1.46
+++ Changes 6 Jan 2006 03:59:05 -0000 1.47
@@ -1,11 +1,11 @@
-Release 2.0 TBD
+Release 2.0.0 Sat Jan 7 2006
- We no longer use the "check" library for C unit testing; we
always use the (partial) internal implementation of the API.
- Report XML_NS setting via XML_GetFeatureList().
- Fixed headers for use from C++.
- Added XML_LARGE_SIZE switch to enable 64bit values for
byte indexes and line/column numbers.
- - Updated to use libtool 1.5.10 (the most recent).
+ - Updated to use libtool 1.5.22 (the most recent).
- Added support for AmigaOS.
- Some mostly minor bug fixes. SF issues include: 1006708,
1021776, 1023646, 1114960, 1156398, 1221160, 1271642.
From kwaclaw at users.sourceforge.net Tue Jan 10 02:24:25 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 10 Jan 2006 02:24:25 +0100 (CET)
Subject: [Expat-checkins] expat Changes,1.47,1.48
Message-ID: <20060110012425.CC1AA1E4007@bag.python.org>
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9217
Modified Files:
Changes
Log Message:
Updated release date.
Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Changes 6 Jan 2006 03:59:05 -0000 1.47
+++ Changes 10 Jan 2006 01:24:20 -0000 1.48
@@ -1,4 +1,4 @@
-Release 2.0.0 Sat Jan 7 2006
+Release 2.0.0 Wed Jan 11 2006
- We no longer use the "check" library for C unit testing; we
always use the (partial) internal implementation of the API.
- Report XML_NS setting via XML_GetFeatureList().
From kwaclaw at users.sourceforge.net Wed Jan 11 02:01:28 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 11 Jan 2006 02:01:28 +0100 (CET)
Subject: [Expat-checkins] expat Changes,1.48,1.49
Message-ID: <20060111010128.D44151E400A@bag.python.org>
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2396
Modified Files:
Changes
Log Message:
More detail on line/column numbers.
Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Changes 10 Jan 2006 01:24:20 -0000 1.48
+++ Changes 11 Jan 2006 01:01:23 -0000 1.49
@@ -3,7 +3,9 @@
always use the (partial) internal implementation of the API.
- Report XML_NS setting via XML_GetFeatureList().
- Fixed headers for use from C++.
- - Added XML_LARGE_SIZE switch to enable 64bit values for
+ - XML_GetCurrentLineNumber() and XML_GetCurrentColumnNumber()
+ now return unsigned integers.
+ - Added XML_LARGE_SIZE switch to enable 64-bit integers for
byte indexes and line/column numbers.
- Updated to use libtool 1.5.22 (the most recent).
- Added support for AmigaOS.
From kwaclaw at users.sourceforge.net Wed Jan 11 02:10:51 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 11 Jan 2006 02:10:51 +0100 (CET)
Subject: [Expat-checkins] expat configure.in,1.40,1.41
Message-ID: <20060111011051.68E531E4002@bag.python.org>
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5616
Modified Files:
configure.in
Log Message:
Updated libtool version info.
Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- configure.in 28 Jan 2005 06:32:30 -0000 1.40
+++ configure.in 11 Jan 2006 01:10:46 -0000 1.41
@@ -25,8 +25,8 @@
dnl GNU M4 to test it right now.
define([expat_version], ifdef([__gnu__],
[esyscmd(conftools/get-version.sh lib/expat.h)],
- [1.95.x]))
-AC_INIT(expat, expat_version, expat-bugs at mail.libexpat.org)
+ [2.0.x]))
+AC_INIT(expat, expat_version, expat-bugs at libexpat.org)
undefine([expat_version])
AC_CONFIG_SRCDIR(Makefile.in)
@@ -44,7 +44,7 @@
dnl If the API changes incompatibly set LIBAGE back to 0
dnl
-LIBCURRENT=5
+LIBCURRENT=6
LIBREVISION=0
LIBAGE=5
From kwaclaw at users.sourceforge.net Wed Jan 11 16:52:16 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 11 Jan 2006 16:52:16 +0100 (CET)
Subject: [Expat-checkins] htdocs index.html,1.59,1.60
Message-ID: <20060111155216.C5F881E4007@bag.python.org>
Update of /cvsroot/expat/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1519
Modified Files:
index.html
Log Message:
Updated web site with release news.
Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- index.html 27 Dec 2005 16:49:44 -0000 1.59
+++ index.html 11 Jan 2006 15:52:12 -0000 1.60
@@ -51,6 +51,24 @@
News
+ - 11 January 2006,
+ Expat 2.0.0 released.
+
+ Release 2.0.0 of the Expat XML parser is the end point of the
+ 1.95.X series of releases. The goal was to solidify and stabilize
+ the implementation of the given API, to add desirable features as
+ long as they fit with the API, and to keep the API backwards compatible
+ if extensions were required. Changes include:
+
- Fixed headers for use from C++.
+ - XML_GetCurrentLineNumber() and XML_GetCurrentColumnNumber()
+ now return unsigned integers.
+ - Added XML_LARGE_SIZE switch to enable 64-bit integers for
+ byte indexes and line/column numbers.
+ - Added support for AmigaOS.
+ - Some mostly minor bug fixes. SF issues include: 1006708,
+ 1021776, 1023646, 1114960, 1156398, 1221160, 1271642.
+
+
27 December 2005,
Final Expat 2.0 pre-release snapshot made available.
From kwaclaw at users.sourceforge.net Thu Jan 19 02:04:29 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Thu, 19 Jan 2006 02:04:29 +0100 (CET)
Subject: [Expat-checkins] expat/lib expatw_static.dsp,1.5,1.6
Message-ID: <20060119010429.B72B11E4002@bag.python.org>
Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10998
Modified Files:
expatw_static.dsp
Log Message:
Added missing XML_UNICODE_WCHAR_T to static debug build for UTF-16.
Index: expatw_static.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expatw_static.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- expatw_static.dsp 30 Sep 2004 02:47:02 -0000 1.5
+++ expatw_static.dsp 19 Jan 2006 01:04:23 -0000 1.6
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "Debug-w_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILED_FROM_DSP" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x1009 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
From kwaclaw at users.sourceforge.net Thu Jan 26 00:04:53 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Thu, 26 Jan 2006 00:04:53 +0100 (CET)
Subject: [Expat-checkins] expat configure.in, 1.41, 1.42 Makefile.in, 1.53,
1.54
Message-ID: <20060125230453.3D76F1E4015@bag.python.org>
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6888
Modified Files:
configure.in Makefile.in
Log Message:
Fix for bug # 1408143: "make check" failure.
Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- configure.in 11 Jan 2006 01:10:46 -0000 1.41
+++ configure.in 25 Jan 2006 23:04:46 -0000 1.42
@@ -76,6 +76,7 @@
AC_TRY_COMPILE(,(void)1,
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS")
+ CXXFLAGS=`echo "$CFLAGS" | sed 's/ -Wmissing-prototypes -Wstrict-prototypes//'`
fi
dnl Checks for header files.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Makefile.in 10 Feb 2005 15:52:02 -0000 1.53
+++ Makefile.in 25 Jan 2006 23:04:46 -0000 1.54
@@ -107,15 +107,16 @@
INCLUDES = -I$(srcdir)/lib -I.
LDFLAGS = @LDFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H
+CPPFLAGS = @CPPFLAGS@ -DHAVE_EXPAT_CONFIG_H
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
### autoconf this?
LTFLAGS = --silent
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
-CXXCOMPILE = $(CXX) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
@@ -174,6 +175,8 @@
.SUFFIXES: .c .lo .o
+.cpp.o:
+ $(CXXCOMPILE) -o $@ -c $<
.c.o:
$(COMPILE) -o $@ -c $<
.c.lo: