diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2004-11-01 13:55:43 +0000 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2004-11-01 13:55:43 +0000 |
| commit | 41e39c7be32fa27484375762296f900cc21eec17 (patch) | |
| tree | 3ff4c0a0dfa3044edc7beaad3bc8fd54f77f9661 /configure.in | |
| parent | e97a79f2ee590c8f135d60d8470bcff2a90a3ef9 (diff) | |
| download | mariadb-git-41e39c7be32fa27484375762296f900cc21eec17.tar.gz | |
aligned ndb versioning with mysql
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
added define NDB_INIT
removed getarg, strlcat, strlcpy
aligned ndb version with mysql version
cpcd: removed old way of reading config file and replaced with mysql load_defaults
changed from using getarg to my_getopts
use mysql my_progname
moved getarg to test
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 353e455dbac..fe487b15557 100644 --- a/configure.in +++ b/configure.in @@ -4,6 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! +# remember to also change ndb version below and update version.c in ndb AM_INIT_AUTOMAKE(mysql, 4.1.8) AM_CONFIG_HEADER(config.h) @@ -13,9 +14,9 @@ DOT_FRM_VERSION=6 SHARED_LIB_VERSION=14:0:0 # ndb version -NDB_VERSION_MAJOR=3 -NDB_VERSION_MINOR=5 -NDB_VERSION_BUILD=4 +NDB_VERSION_MAJOR=4 +NDB_VERSION_MINOR=1 +NDB_VERSION_BUILD=8 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? @@ -1142,8 +1143,8 @@ dnl Is this the right match for DEC OSF on alpha? fi echo "Adding defines for OSF1" # gethostbyname_r is deprecated and doesn't work ok on OSF1 - CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_ZERO" - CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_ZERO" + CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_TRUNC" + CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_TRUNC" # fix to handle include of <stdint.h> correctly on OSF1 with cxx compiler CXXFLAGS="$CXXFLAGS -I/usr/include/cxx -I/usr/include/cxx_cname -I/usr/include -I/usr/include.dtk" ;; |