--- libast-0.8/include/Makefile.am
+++ libast-0.8/include/Makefile.am
@@ -7,7 +7,7 @@ nobase_include_HEADERS = libast.h libast
 	libast/thread_if.h libast/tok.h libast/url.h libast/ustr.h	\
 	libast/vector_if.h
 
-nodist_include_HEADERS = libast/sysdefs.h libast/types.h
+nobase_nodist_include_HEADERS = libast/sysdefs.h libast/types.h
 noinst_HEADERS = libast_internal.h
 
 libast/types.h: libast/types.h.in
--- libast-0.8/libast.m4
+++ libast-0.8/libast.m4
@@ -258,9 +258,13 @@ AC_DEFUN([AST_MMX_SUPPORT], [
     AC_ARG_ENABLE(mmx, [  --enable-mmx            enable MMX assembly routines], [
                      test x$enableval = xyes && HAVE_MMX="yes"
                   ], [
-                     if test x$build_os = xlinux-gnu; then
-                         grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
-                     fi
+                     case "$host_cpu" in
+                         i?86|x86_64)
+                             if test x$build_os = xlinux-gnu -a x$cross_compiling != xyes; then
+                                 grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
+                             fi
+                             ;;
+                     esac
                   ])
     LIBAST_MMX_SUPPORT=""
     if test -n "$HAVE_MMX"; then