mirror of
https://github.com/libexpat/libexpat.git
synced 2025-04-07 22:19:12 +00:00
Fix for bug # 1408143: "make check" failure.
This commit is contained in:
parent
6745f2401a
commit
e5bee8cde7
2 changed files with 7 additions and 3 deletions
|
@ -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:
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Reference in a new issue