merge: fix++

SVN revision: 76466

diff --git a/configure.ac b/configure.ac
index 4c2a2e9..8eb5726 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,7 @@ AC_SUBST([release_info])
 
 ### compilers
 
+AM_PROG_AS
 AC_PROG_CXX
 AC_LANG(C)
 AC_PROG_CPP

diff --git a/src/bin/evil/Makefile.am b/src/bin/evil/Makefile.am
index 538bbdc..32984d5 100644 (file)
--- a/src/bin/evil/Makefile.am
+++ b/src/bin/evil/Makefile.am
@@ -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
 

diff --git a/src/lib/evil/Makefile.am b/src/lib/evil/Makefile.am
index 62d0d56..8876d77 100644 (file)
--- a/src/lib/evil/Makefile.am
+++ b/src/lib/evil/Makefile.am
@@ -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)