[Expat-checkins] expat configure.in, 1.41, 1.42 Makefile.in, 1.53, 1.54

[Karl Waclawek]

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: