--- np2/x11/configure.ac 2012/01/22 21:23:43 1.19 +++ np2/x11/configure.ac 2012/01/24 18:17:47 1.22 @@ -4,9 +4,9 @@ dnl dnl require autoconf 2.59 AC_PREREQ(2.59) -AC_REVISION($Revision: 1.19 $) +AC_REVISION($Revision: 1.22 $) -AC_INIT(Xnp2,0.83-20120122,nonakap@gmail.com,xnp2) +AC_INIT(Xnp2,0.83-20120124,nonakap@gmail.com,xnp2) AM_INIT_AUTOMAKE([no-define no-dist no-installinfo subdir-objects]) AC_CONFIG_SRCDIR([../np2ver.h]) AC_CONFIG_HEADERS(config.h) @@ -46,9 +46,7 @@ AC_SYS_LARGEFILE dnl dnl Check GCC dnl -if test x"$GCC" != "xyes"; then - AC_MSG_ERROR(This package required GCC.) -fi +AM_CONDITIONAL(HAVE_GCC,test x"$GCC" = "xyes") dnl dnl Checks for library functions. @@ -150,6 +148,15 @@ if test x"$enable_xf86vidmode" = "xyes"; fi dnl +dnl Checks for nasm +dnl +AC_CHECK_PROGS(nasm,[nasm nasmw],no) +AM_CONDITIONAL(HAVE_NASM,test x$"nasm" != "xno") +if test x"$nasm" != "xno"; then + AC_DEFINE(HAVE_NASM,,[Define if have nasm]) +fi + +dnl dnl Checks for IA-32 CPU emulation dnl AC_MSG_CHECKING([whether to use IA-32 emulation])