Rework debug_default handling to work with autoconf-2.5x. (#106348)

Fri May 30 15:58:33 2003  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Rework debug_default handling to work
        with autoconf-2.5x. (#106348)
This commit is contained in:
Owen Taylor
2003-05-30 20:15:43 +00:00
committed by Owen Taylor
parent 60bada5f3a
commit ba3dec7e39
6 changed files with 46 additions and 18 deletions

View File

@@ -1,3 +1,8 @@
Fri May 30 15:58:33 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Rework debug_default handling to work
with autoconf-2.5x. (#106348)
Fri May 30 20:24:11 2003 Kristian Rietveld <kris@gtk.org>
* configure.in: added "li" to ALL_LINGUAS

View File

@@ -1,3 +1,8 @@
Fri May 30 15:58:33 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Rework debug_default handling to work
with autoconf-2.5x. (#106348)
Fri May 30 20:24:11 2003 Kristian Rietveld <kris@gtk.org>
* configure.in: added "li" to ALL_LINGUAS

View File

@@ -1,3 +1,8 @@
Fri May 30 15:58:33 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Rework debug_default handling to work
with autoconf-2.5x. (#106348)
Fri May 30 20:24:11 2003 Kristian Rietveld <kris@gtk.org>
* configure.in: added "li" to ALL_LINGUAS

View File

@@ -1,3 +1,8 @@
Fri May 30 15:58:33 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Rework debug_default handling to work
with autoconf-2.5x. (#106348)
Fri May 30 20:24:11 2003 Kristian Rietveld <kris@gtk.org>
* configure.in: added "li" to ALL_LINGUAS

View File

@@ -1,3 +1,8 @@
Fri May 30 15:58:33 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Rework debug_default handling to work
with autoconf-2.5x. (#106348)
Fri May 30 20:24:11 2003 Kristian Rietveld <kris@gtk.org>
* configure.in: added "li" to ALL_LINGUAS

View File

@@ -20,7 +20,6 @@ cflags_set=${CFLAGS+set}
dnl we to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
dnl are available for $ac_help expansion (don't we all *love* autoconf?)
GLIB_AC_DIVERT_BEFORE_HELP([
#
# Making releases:
# GTK_MICRO_VERSION += 1;
@@ -30,15 +29,29 @@ GLIB_AC_DIVERT_BEFORE_HELP([
# if backwards compatibility has been broken,
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
#
GTK_MAJOR_VERSION=2
GTK_MINOR_VERSION=2
GTK_MICRO_VERSION=1
GTK_INTERFACE_AGE=1
GTK_BINARY_AGE=201
m4_define([gtk_major_version], [2])
m4_define([gtk_minor_version], [2])
m4_define([gtk_micro_version], [1])
m4_define([gtk_interface_age], [1])
# if the minor version number is odd, then we want debugging. Otherwise
# we only want minimal debugging support.
m4_define([gtk_debug_default],
[m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum])])dnl
GTK_MAJOR_VERSION=gtk_major_version
GTK_MINOR_VERSION=gtk_minor_version
GTK_MICRO_VERSION=gtk_micro_version
GTK_INTERFACE_AGE=gtk_interface_age
GTK_BINARY_AGE=`expr 100 '*' $GTK_MINOR_VERSION + $GTK_MICRO_VERSION`
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
dnl This is the X.Y used in -lgtk-FOO-X.Y
GTK_API_VERSION=2.0
])dnl
# 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
AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_MINOR_VERSION)
@@ -162,18 +175,8 @@ if test "$os_win32" = "yes"; then
fi
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
dnl figure debugging default, prior to $ac_help setup
dnl
GLIB_AC_DIVERT_BEFORE_HELP([
if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
debug_default=yes
else
debug_default=minimum
fi
])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=gtk_debug_default@:>@],,enable_debug=gtk_debug_default)
AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]],
echo $enable_shm, enable_shm="yes")
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],