From: Matthias Clasen Date: Sun, 2 Jul 2006 18:35:53 +0000 (+0000) Subject: Set version to 2.12 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=900a819f456b1410447a19b01c859523e2a90b1b;p=dana%2Fcg-glib.git Set version to 2.12 --- diff --git a/ChangeLog b/ChangeLog index 28c164ac..5e73e39e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-06-30 Matthias Clasen + + * configure.in: Set version to 2.12.0 + 2006-06-20 Matthias Clasen * glib/gtimer.c (mktime_utc): Fix an off-by-2 error diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 28c164ac..5e73e39e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2006-06-30 Matthias Clasen + + * configure.in: Set version to 2.12.0 + 2006-06-20 Matthias Clasen * glib/gtimer.c (mktime_utc): Fix an off-by-2 error diff --git a/configure.in b/configure.in index 00542f67..42eefdb7 100644 --- a/configure.in +++ b/configure.in @@ -26,9 +26,9 @@ m4_include(m4macros/glib-gettext.m4)dnl # set glib_binary_age _and_ glib_interface_age to 0. # m4_define([glib_major_version], [2]) -m4_define([glib_minor_version], [11]) -m4_define([glib_micro_version], [5]) -m4_define([glib_interface_age], [3]) +m4_define([glib_minor_version], [12]) +m4_define([glib_micro_version], [0]) +m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) m4_define([glib_version], @@ -855,7 +855,7 @@ fi AC_MSG_RESULT(unsigned $glib_size_type) # Check for some functions -AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf setenv unsetenv getc_unlocked readlink symlink) +AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf setenv unsetenv getc_unlocked readlink symlink) AC_CHECK_HEADERS(crt_externs.h) AC_CHECK_FUNCS(_NSGetEnviron)