merge: fix++

SVN revision: 76466
This commit is contained in:
Vincent Torri 2012-09-11 17:11:37 +00:00
parent cd69ef4c8a
commit a96ba56971
3 changed files with 5 additions and 4 deletions

View File

@ -174,6 +174,7 @@ AC_SUBST([release_info])
### compilers
AM_PROG_AS
AC_PROG_CXX
AC_LANG(C)
AC_PROG_CPP

View File

@ -35,7 +35,7 @@ evil_test_print.h \
evil_test_realpath.h \
evil_test_util.h
if EVIL_HAVE_WINCE
if HAVE_WINCE
evil_suite_SOURCES += memcpy_glibc_arm.S

View File

@ -24,7 +24,7 @@ evil_util.h
stdheadersdir = $(includedir)/evil-@VMAJ@
nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h
if EVIL_HAVE_WINCE
if HAVE_WINCE
nobase_dist_stdheaders_DATA += mingw32ce/errno.h
@ -85,7 +85,7 @@ evil_pformat.h \
evil_private.h \
evil_fnmatch_private.h
if EVIL_HAVE_WINCE
if HAVE_WINCE
libevil_la_SOURCES += evil_errno.c evil_link_ce.c
@ -101,7 +101,7 @@ libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
libevil_la_LIBADD = @EVIL_LIBS@
libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
if EVIL_HAVE_WINCE
if HAVE_WINCE
libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS)