[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2784)

13 Dec 2009

#At lp:maria

 2784 knielsen@knielsen-hq.org	2009-12-13
      Fix source tarball name and 99 char path limitation.
      
      Fix obsolete automake usage in AM_INIT_AUTOMAKE so we can use the option to use
      tar version without 99 char pathname limit.
      modified:
        configure.in
        win/configure.js
        win/make_mariadb_win_dist

per-file messages:
  configure.in
    Fix obsolete usage of AM_INIT_AUTOMAKE.
    Set option to use tar file format without 99 char lenght limit.
  win/configure.js
    Update parsing of configure.in
  win/make_mariadb_win_dist
    Update parsing of configure.in
=== modified file 'configure.in'

--- a/configure.in	2009-12-03 11:34:11 +0000
+++ b/configure.in	2009-12-13 22:04:39 +0000
@@ -3,8 +3,6 @@ dnl Process this file with autoconf to p
 
 AC_PREREQ(2.52)dnl		Minimum Autoconf version required.
 
-AC_INIT(sql/mysqld.cc)
-AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also update version.c in ndb
 #
@@ -15,7 +13,12 @@ AC_CANONICAL_SYSTEM
 # MySQL version number.
 #
 # Note: the following line must be parseable by win/configure.js:GetVersion()
-AM_INIT_AUTOMAKE(mysql, 5.1.41-MariaDB-beta)
+# and by win/make_mariadb_win_dist
+AC_INIT(mysql, 5.1.41-MariaDB-beta)
+AC_CONFIG_SRCDIR(sql/mysqld.cc)
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE([tar-ustar])
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

=== modified file 'win/configure.js'
--- a/win/configure.js	2009-10-07 21:00:29 +0000
+++ b/win/configure.js	2009-12-13 22:04:39 +0000
@@ -155,8 +155,8 @@ function GetValue(str, key)
 
 function GetVersion(str)
 {
-    var key = "AM_INIT_AUTOMAKE(mysql, ";
-    var key2 = "AM_INIT_AUTOMAKE(mariadb, ";
+    var key = "AC_INIT(mysql, ";
+    var key2 = "AC_INIT(mariadb, ";
     var key_len = key.length;
     var pos = str.indexOf(key); //5.0.6-beta)
     if (pos == -1)

=== modified file 'win/make_mariadb_win_dist'
--- a/win/make_mariadb_win_dist	2009-10-30 10:50:48 +0000
+++ b/win/make_mariadb_win_dist	2009-12-13 22:04:39 +0000
@@ -25,7 +25,7 @@ devenv.com MySQL.sln /build Debug
 
 # TODO extract version number
 VER=`cat configure.in | 
-     perl -e 'while (<>) { if (/^AM_INIT_AUTOMAKE\([a-z ]*, *([0-9a-z\.-]+)/) { print "$1\n"; exit(0)} } ; exit 1'`
+     perl -e 'while (<>) { if (/^AC_INIT\([a-z ]*, *([0-9a-z\.-]+)/) { print "$1\n"; exit(0)} } ; exit 1'`
 
 echo Version string: $VER.

    

knielsen＠knielsen-hq.org

tags

participants (1)