AC_MSG_CHECKING([whether to build GUI])
if test x$ac_cv_enable_gui = xyes; then
AC_MSG_RESULT(yes)
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0, CFLAGS="${CFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED", dnl
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0, [], dnl
ac_cv_enable_gui=no)
if test x$ac_cv_enable_gui = xyes; then
AC_DEFINE([HAVE_GTK],1,[Set to 1 to enable GTK+ support for building GUI.])
+
+ GTK_CFLAGS="${GTK_CFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
fi
AM_CONDITIONAL([USE_GTK], [test x${ac_cv_enable_gui} = xyes])
-dnl Try to locate asem 8051 compiler to generate test files (.hex)
-AC_CHECK_PROG(ASEM_CHECK,asem,yes)
-if test x"$ASEM_CHECK" != x"yes" ; then
- AC_MSG_WARN([Please install asem (http://plit.de/asem-51) to run test suite.])
+dnl Try to locate valid 8051 assembler to generate test files (.hex)
+run_tests=no
+
+AC_CHECK_PROG(AS504_CHECK,as504,yes)
+if test x"$AS504_CHECK" = x"yes" ; then
+ run_tests=yes
+
+ dnl Check if as504 has been patched to support option -O:
+ dnl See http://www.hugovil.com/repository/hvlinux/patches/as504-add-output-file-option.patch
+ AS504HV_CHECK=no
+ if as504 2>&1 | grep -q Ooutfile; then
+ AS504HV_CHECK=yes
+ fi
+fi
+
+AC_CHECK_PROG(ASEM51_CHECK,asem,yes)
+if test x"$ASEM51_CHECK" = x"yes" ; then
+ run_tests=yes
+fi
+
+if test x"$run_tests" != x"yes" ; then
+ AC_MSG_WARN([Please install as504 (http://www.vanwal.nl/as504/) or ASEM-51 (http://plit.de/asem-51) to run test suite.])
fi
-AM_CONDITIONAL([RUN_TESTS],[test x"$ASEM_CHECK" = x"yes"])
+AM_CONDITIONAL([RUN_TESTS],[test x"$run_tests" = x"yes"])
+AM_CONDITIONAL([USE_AS504HV],[test x"$AS504HV_CHECK" = x"yes"])
+AM_CONDITIONAL([USE_AS504],[test x"$AS504_CHECK" = x"yes"])
+AM_CONDITIONAL([USE_AS51],[test x"$ASEM51_CHECK" = x"yes"])
AC_SUBST(CFLAGS)
AC_SUBST(LIBS)