diff options
author | kwaclaw <kwaclaw> | 2006-01-25 23:04:46 +0000 |
---|---|---|
committer | kwaclaw <kwaclaw> | 2006-01-25 23:04:46 +0000 |
commit | 88511ede17cdba20e5090ba76ac90333f3399eb0 (patch) | |
tree | 49170128c722bfa9204e057bb4c950df68db08d9 | |
parent | 7b97770f64825dc901255063a99a544a3ae481bc (diff) | |
download | libexpat-88511ede17cdba20e5090ba76ac90333f3399eb0.tar.gz |
Fix for bug # 1408143: "make check" failure.
-rw-r--r-- | Makefile.in | 9 | ||||
-rw-r--r-- | configure.in | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index aadeda1..97f2051 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,15 +107,16 @@ LIBTOOL = @LIBTOOL@ 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 @@ run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite .SUFFIXES: .c .lo .o +.cpp.o: + $(CXXCOMPILE) -o $@ -c $< .c.o: $(COMPILE) -o $@ -c $< .c.lo: diff --git a/configure.in b/configure.in index 9d3a6f7..e0f88ac 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,7 @@ if test "$GCC" = yes ; then 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. |