From fb0a0dfea94d63bba2f586f32366ac803fc6664c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 30 May 2003 20:15:54 +0000 Subject: [PATCH] Rework debug_default handling to work with autoconf-2.5x. (#106348) Fri May 30 15:58:33 2003 Owen Taylor * configure.in: Rework debug_default handling to work with autoconf-2.5x. (#106348) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 30 +++++++++++++++--------------- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a385d4ea..bd0ca8df1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 30 15:58:33 2003 Owen Taylor + + * configure.in: Rework debug_default handling to work + with autoconf-2.5x. (#106348) + Fri May 30 15:51:43 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1a385d4ea..bd0ca8df1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri May 30 15:58:33 2003 Owen Taylor + + * configure.in: Rework debug_default handling to work + with autoconf-2.5x. (#106348) + Fri May 30 15:51:43 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1a385d4ea..bd0ca8df1 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Fri May 30 15:58:33 2003 Owen Taylor + + * configure.in: Rework debug_default handling to work + with autoconf-2.5x. (#106348) + Fri May 30 15:51:43 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1a385d4ea..bd0ca8df1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri May 30 15:58:33 2003 Owen Taylor + + * configure.in: Rework debug_default handling to work + with autoconf-2.5x. (#106348) + Fri May 30 15:51:43 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1a385d4ea..bd0ca8df1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri May 30 15:58:33 2003 Owen Taylor + + * configure.in: Rework debug_default handling to work + with autoconf-2.5x. (#106348) + Fri May 30 15:51:43 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1a385d4ea..bd0ca8df1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri May 30 15:58:33 2003 Owen Taylor + + * configure.in: Rework debug_default handling to work + with autoconf-2.5x. (#106348) + Fri May 30 15:51:43 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): diff --git a/configure.in b/configure.in index 935053acb..077696d09 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,6 @@ AC_INIT(glib/glib.h) # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} -GLIB_AC_DIVERT_BEFORE_HELP([ # # The following version number definitions apply to GLib, GModule, GObject # and GThread as a whole, so if changes occoured in any of them, they are all @@ -31,13 +30,22 @@ GLIB_AC_DIVERT_BEFORE_HELP([ # if backwards compatibility has been broken, # set GLIB_BINARY_AGE _and_ GLIB_INTERFACE_AGE to 0. # -GLIB_MAJOR_VERSION=2 -GLIB_MINOR_VERSION=2 -GLIB_MICRO_VERSION=1 -GLIB_INTERFACE_AGE=1 +m4_define([glib_major_version], [2]) +m4_define([glib_minor_version], [2]) +m4_define([glib_micro_version], [1]) +m4_define([glib_interface_age], [1]) + +# if the minor version number is odd, then we want debugging. Otherwise +# we only want minimal debugging support. +m4_define([glib_debug_default], + [m4_if(m4_eval(glib_minor_version % 2), [1], [yes], [minimum])])dnl + +GLIB_MAJOR_VERSION=glib_major_version +GLIB_MINOR_VERSION=glib_minor_version +GLIB_MICRO_VERSION=glib_micro_version +GLIB_INTERFACE_AGE=glib_interface_age GLIB_BINARY_AGE=`expr 100 '*' $GLIB_MINOR_VERSION + $GLIB_MICRO_VERSION` GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION -])dnl AC_SUBST(GLIB_MAJOR_VERSION) AC_SUBST(GLIB_MINOR_VERSION) @@ -139,16 +147,8 @@ if test "$glib_native_win32" = "yes"; then fi AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) -GLIB_AC_DIVERT_BEFORE_HELP([ -# figure debugging default, prior to $ac_help setup -case $GLIB_MINOR_VERSION in -*[[13579]]) debug_default=yes ;; -*) debug_default=minimum ;; -esac[]dnl -]) - dnl declare --enable-* args and collect ac_help strings -AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) +AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging @<:@default=glib_debug_default@:>@],,enable_debug=glib_debug_default) AC_ARG_ENABLE(gc_friendly, [ --enable-gc-friendly turn on garbage collector friendliness [default=no]],,enable_gc_friendly=no) AC_ARG_ENABLE(mem_pools, [ --disable-mem-pools disable all glib memory pools],,disable_mem_pools=no) AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],