diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 26 | ||||
| -rw-r--r-- | mixgtk/mixgtk_mixvm.c | 4 | ||||
| -rw-r--r-- | mixlib/testsuite/Makefile.am | 2 |
4 files changed, 20 insertions, 14 deletions
@@ -6,7 +6,7 @@ See the end for copying conditions. Please send mdk bug reports to bug-mdk@gnu.org. --------------------------------------------------------------------------- -* Version 1.2.3 (11/08/06) +* Version 1.2.3 (16/08/06) ** GUI improvements: diff --git a/configure.in b/configure.in index 8b3bd6d..d96b4bf 100644 --- a/configure.in +++ b/configure.in @@ -23,8 +23,18 @@ AM_PROG_LEX AC_PROG_RANLIB dnl additional c flags -CFLAGS="$CFLAGS -fno-strict-aliasing" -AC_SUBST(CFLAGS) +AM_CFLAGS="$AM_CFLAGS -Wall -fno-strict-aliasing" +AC_ARG_WITH(werror, +[ --with-werror treat compilation errors as warnings], +[case "${withval}" in + yes) werr=true ;; + no) werr=false ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-werror) ;; +esac], [werr=false]) + +if test x$werr = xtrue; then + AM_CFLAGS="$AM_CFLAGS -Werror" +fi dnl i18n stuff AM_GNU_GETTEXT_VERSION(0.14) @@ -89,7 +99,7 @@ if test x$wguile = xtrue; then GUILE_CFLAGS="`guile-config compile`" GUILE_LDFLAGS="`guile-config link`" LIBS="$LIBS $GUILE_LDFLAGS" - CFLAGS="$CFLAGS $GUILE_CFLAGS" + AM_CFLAGS="$AM_CFLAGS $GUILE_CFLAGS" AC_SUBST(MAKE_GUILE) AC_MSG_RESULT(yes) fi @@ -100,7 +110,7 @@ dnl Check for glib PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.0) LIBS="$LIBS $GLIB_LIBS" -CFLAGS="$CFLAGS $GLIB_CFLAGS -DG_DISABLE_DEPRECATED" +AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS -DG_DISABLE_DEPRECATED" dnl Check if the gtk gui is required AC_ARG_ENABLE(gui, @@ -114,13 +124,13 @@ esac],[gui=true]) dnl Check for gtk+ if test x$gui = xtrue; then PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0.0 pango >= 1.4, - [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"], + [LIBS="$LIBS $GTK_LIBS" AM_CFLAGS="$AM_CFLAGS $GTK_CFLAGS"], [AC_MSG_WARN(Cannot find GTK+/Glade/Pango: the GUI shall not be built) gui=false]) fi if test x$gui = xtrue; then -CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED" +AM_CFLAGS="$AM_CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED" fi dnl use the provided getopt if gnu getopt is not available @@ -128,9 +138,7 @@ AC_REPLACE_FUNCS(getopt_long) AM_CONDITIONAL(MAKE_GUI, test x$gui = xtrue) -CFLAGS="$CFLAGS -Wall -Werror" - -AC_SUBST(CFLAGS) +AC_SUBST(AM_CFLAGS) AC_CONFIG_FILES( Makefile diff --git a/mixgtk/mixgtk_mixvm.c b/mixgtk/mixgtk_mixvm.c index c7b4992..dc7500c 100644 --- a/mixgtk/mixgtk_mixvm.c +++ b/mixgtk/mixgtk_mixvm.c @@ -170,9 +170,7 @@ mixgtk_mixvm_update_over_toggle (void) void mixgtk_mixvm_update_cmp (void) { - gint toggle; - - toggle = mix_vm_get_cmpflag (vm_); + gint toggle = mix_vm_get_cmpflag (vm_); gtk_toggle_button_set_active (cmp_buttons_[toggle], TRUE); } diff --git a/mixlib/testsuite/Makefile.am b/mixlib/testsuite/Makefile.am index 568f071..3878cff 100644 --- a/mixlib/testsuite/Makefile.am +++ b/mixlib/testsuite/Makefile.am @@ -19,7 +19,7 @@ TESTS = $(check_PROGRAMS) MIXAL_FILES= "\"tests/bt\",\"tests/cbp\",\"tests/stress0\",\"tests/stress1\",\"tests/stress2\",\"tests/stress4\",\"tests/stress5\",\"tests/stress6\",\"tests/ldan\",\"tests/lockonw\",\"tests/negwrite\",\"hello\",\"echo\",\"primes\",\"isains\"" -AM_CFLAGS = -DMIX_TEST_MIXAL_FILES=$(MIXAL_FILES) -DMIX_TEST_SAMPLES_DIR="\"$(top_srcdir)/samples\"" +AM_CFLAGS += -DMIX_TEST_MIXAL_FILES=$(MIXAL_FILES) -DMIX_TEST_SAMPLES_DIR="\"$(top_srcdir)/samples\"" mixtypest_SOURCES = test.h mix_types_t.c mixinstest_SOURCES = test.h mix_ins_t.c |