On the road of 1.3.0

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index a08d8429f94a1cdb536bccd89a57ee01ba39db6b..294c3ef85579abfaad95d3e523ecc365353182f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,19 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2011 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 1.2.0-pre2)
+AC_INIT(vlc, 1.3.0-git)
 VERSION_MAJOR=1
-VERSION_MINOR=2
+VERSION_MINOR=3
 VERSION_REVISION=0
 VERSION_EXTRA=0
-VERSION_DEV=pre1
+VERSION_DEV=git
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Twoflower"
+CODENAME="Rincewind"
 COPYRIGHT_YEARS="1996-2011"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
@@ -486,8 +486,6 @@ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
     AC_MSG_ERROR([Buggy GNU/libc (version 2.5 - 2.7) present. VLC would crash; there is no viable
 work-around for this. Check with your distribution vendor on how to update the
 glibc run-time. Alternatively, build with --disable-nls.])
-  ], [
-    AC_DEFINE(DISABLE_BUGGY_GLIBC_CHECK, 1, [Disables runtime check for buggy glibc.])
   ])
 ])