X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=configure.ac;h=2f0407a78eb2dbf2fb1a7488c48328b8279878ee;hb=ba7ff1a7a78b3aa7c2cad9bfce117256638938b1;hp=f2b2da9733f2a2626dd224bdf3f76f35ea13b4ee;hpb=a78a174393ff9c8dbc0d5212576507f25d7e9bf1;p=emu8051.git diff --git a/configure.ac b/configure.ac index f2b2da9..2f0407a 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) @@ -13,11 +13,6 @@ 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 @@ -34,6 +29,10 @@ 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, [ --enable-gui Enable building the GUI (default=yes)], @@ -41,7 +40,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) @@ -58,7 +59,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 \ "---------------------------------------------------------------------------