X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=dd1333638bb5c4013af2a895ad833b136fb95a28;hb=0ddadb203a71a62ea2be1cc9825305ccde1fbfed;hp=9ed326d19b099a51524c4f6bce657257554fce25;hpb=97bcc837a41e7dd3b8381f284495924c2e4ba3b9;p=emu8051.git diff --git a/configure.ac b/configure.ac index 9ed326d..dd13336 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac -- Process this file with autoconf to produce configure dnl Initialization stuff. -AC_INIT(emu8051, 1.1.0) +AC_INIT(emu8051, 1.1.2) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR(src/cpu8051.c) AM_CONFIG_HEADER(config.h:config-h.in) @@ -21,13 +21,9 @@ AC_TYPE_SIZE_T dnl Basic CFLAGS values CFLAGS="${CFLAGS} -Wall" -dnl Checks for '--enable-debug' option -HV_CHECK_FOR_DEBUG - -if test x"${debug_messages}" = x1; then -dnl -g is for GDB debugging - CFLAGS="${CFLAGS} -g -gdwarf-2 -g3" -fi +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0]) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) dnl Checks for Gtk+-2.0 AC_ARG_ENABLE(gui, @@ -36,7 +32,9 @@ 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.0.5, :, ac_cv_enable_gui=no) + 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$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) @@ -53,7 +51,7 @@ AC_SUBST(LIBS) AC_SUBST(ac_aux_dir) dnl Creating output file(s) -AC_OUTPUT(Makefile src/Makefile doc/Makefile) +AC_OUTPUT(Makefile src/Makefile data/Makefile doc/Makefile) echo \ "--------------------------------------------------------------------------- @@ -71,13 +69,6 @@ else echo "no" fi -echo -n " Debugging messages: " -if test x"${debug_messages}" = x1; then - echo "yes" -else - echo "no" -fi - echo \ " See config.h for further configuration information.