diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-04 00:37:59 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-04 00:37:59 +0300 |
| commit | ab73713265f118ebbb93f5245a6b1397f3afcb45 (patch) | |
| tree | fa35b7b0722a38bd59076ede315ee9b6bbd5a8a2 | |
| parent | c746716869391e29c52ea47b2d6d342299de86c3 (diff) | |
| parent | 673ec7b24d1e4c8806d964ef262f39fadc84da70 (diff) | |
| download | mariadb-git-ab73713265f118ebbb93f5245a6b1397f3afcb45.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- configure.in
| -rw-r--r-- | configure.in | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 658a1c6bd9b..5f570307ac9 100644 --- a/configure.in +++ b/configure.in @@ -16,17 +16,23 @@ dnl Process this file with autoconf to produce a configure script. # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AC_PREREQ(2.52)dnl Minimum Autoconf version required. +# Minimum Autoconf version required. +AC_PREREQ(2.59) -AC_INIT(sql/mysqld.cc) -AC_CANONICAL_SYSTEM -# The Docs Makefile.am parses this line! -# remember to also update version.c in ndb -# +# Remember to also update version.c in ndb. # When changing major version number please also check switch statement # in client/mysqlbinlog.cc:check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.5.99-m3) -AM_CONFIG_HEADER([include/config.h:config.h.in]) +AC_INIT([MySQL Server], [5.5.99-m3], [], [mysql]) +AC_CONFIG_SRCDIR([sql/mysqld.cc]) +AC_CANONICAL_SYSTEM +# USTAR format gives us the possibility to store longer path names in +# TAR files, the path name is split into two parts, a 155 chacater +# first part and a 100 character second part. +AM_INIT_AUTOMAKE([1.9 tar-ustar]) +LT_INIT +LT_PREREQ([1.5.6]) + +AM_CONFIG_HEADER([include/config.h]) # Request support for automake silent-rules if available. # Default to verbose output. One can use the configure-time |