Remove CSEG directive for compatibility with AS31 and AS504 assemblers

[emu8051.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfa92d6..3dff646 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR(src/cpu8051.c)
 AM_CONFIG_HEADER(config.h:config-h.in)
 dnl Checking if the NEWS file has been updated to reflect the current version.
-AM_INIT_AUTOMAKE(check-news)
+AM_INIT_AUTOMAKE(check-news -Wall std-options color-tests parallel-tests)
 AM_SILENT_RULES([yes])
 
 dnl Testing the C compiler.
@@ -33,11 +33,14 @@ AC_ARG_ENABLE(gui,
 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
@@ -47,30 +50,17 @@ 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.])
+fi
+
+AM_CONDITIONAL([RUN_TESTS],[test x"$ASEM_CHECK" = x"yes"])
+
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(ac_aux_dir)
 
 dnl Creating output file(s)
-AC_OUTPUT(Makefile src/Makefile data/Makefile doc/Makefile)
-
-echo \
-"---------------------------------------------------------------------------
-Configuration:
-
-  Install path:        ${prefix}
-  Compiler:            ${CC}
-  Compiler flags:      ${CFLAGS}
-  Linker flags:        ${LIBS}"
-
-echo -n "  Build GUI:           "
-if test x"${ac_cv_enable_gui}" = xyes; then
-  echo "yes"
-else
-  echo "no"
-fi
-
-echo \
-"
-  See config.h for further configuration information.
----------------------------------------------------------------------------"
+AC_OUTPUT(Makefile src/Makefile data/Makefile doc/Makefile tests/Makefile)