X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=configure.ac;h=c4be40fa410e4995ffc34c053097373cf4cde370;hb=1a20c858a966bc61b48cce36846e6ed426d62644;hp=2381fc9948528bb4bf3e4c3b3663411f1f4b6492;hpb=fc4dd8fa3aab94a5f63c097ed9809c75560abd7d;p=emu8051.git

diff --git a/configure.ac b/configure.ac
index 2381fc9..c4be40f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,67 +1,77 @@
 # configure.ac -- Process this file with autoconf to produce configure
 
 dnl Initialization stuff.
-AC_INIT(emu8051, 1.0.2)
-AC_CONFIG_AUX_DIR(config)
+AC_INIT([emu8051], [1.1.2], [hugo@hugovil.com], [emu8051],
+	[http://www.hugovil.com/fr/emu8051/])
+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 Tests the C compiler
-AC_PROG_CC
+dnl Testing the C compiler.
+AM_PROG_CC_C_O
 AC_LANG_C
 
-dnl Checking for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(strings.h unistd.h)
-
 dnl Checking for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 
 dnl Basic CFLAGS values
-CFLAGS="-Wall"
+CFLAGS="${CFLAGS} -Wall"
+
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 
-dnl Checks for '--enable-debug' option
-HV_CHECK_FOR_DEBUG
+dnl Checks for Gtk+-2.0
+AC_ARG_ENABLE(gui,
+	[  --enable-gui     Enable building the GUI (default=yes)],
+	[ac_cv_enable_gui=$enableval], [ac_cv_enable_gui=yes])
+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
+        ac_cv_enable_gui=no)
 
-if test x"${debug_messages}" = x1; then
-dnl -g is for GDB debugging
-  CFLAGS="${CFLAGS} -g -gdwarf-2 -g3"
+	if test x$ac_cv_enable_gui = xyes; then
+	    AC_DEFINE([HAVE_GTK],1,[Set to 1 to enable GTK+ support for building GUI.])
+            AC_SUBST(GTK_CFLAGS)
+            AC_SUBST(GTK_LIBS)
+	fi
+else
+	AC_MSG_RESULT(no)
 fi
 
-dnl Checks for Gtk+-2.0
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+AM_CONDITIONAL([USE_GTK], [test x${ac_cv_enable_gui} = xyes])
+
+dnl Check if tests are enabled (disabled by default)
+AC_ARG_ENABLE([tests],
+              [AS_HELP_STRING([--enable-tests],[Run test suite])],
+              [run_tests=${enableval}],
+              [run_tests="no"])
+
+dnl If tests are enabled, try to locate asem 8051 compiler
+if test x"${run_tests}" = xyes; then
+    dnl Tests for 8051 assembler to generate hex test files
+    dnl TODO: add argument to specify location of asem executable...
+    AC_CHECK_PROG(ASEM_CHECK,asem,yes)
+    if test x"$ASEM_CHECK" != x"yes" ; then
+	 AC_MSG_ERROR([Please install asem (http://plit.de/asem-51) to run test suite.])
+    fi
+fi
+
+AM_CONDITIONAL([RUN_TESTS],[test "x$run_tests" = "xyes"])
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(ac_aux_dir)
 
 dnl Creating output file(s)
-AC_OUTPUT(Makefile src/Makefile doc/Makefile)
-
-echo \
-"---------------------------------------------------------------------------
-Configuration:
+AC_OUTPUT(Makefile src/Makefile data/Makefile doc/Makefile)
 
-  Install path:        ${prefix}
-  Compiler:            ${CC}
-  Compiler flags:      ${CFLAGS}
-  Linker flags:        ${LIBS}"
-
-echo -n "  Debugging messages:  "
-if test x"${debug_messages}" = x1; then
-  echo "yes"
-else
-  echo "no"
+if test x"${run_tests}" = xyes; then
+    AC_OUTPUT(tests/Makefile)
 fi
-
-echo \
-"
-  See config.h for further configuration information.
----------------------------------------------------------------------------"