← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
23
23
# We take some made up examples
24
24
#
25
25
#  VERSION                  5.1.40sp1-alpha     5.0.34a
26
 
#  MYSQL_NO_DASH_VERSION    5.1.40sp1           5.0.34a
27
 
#  MYSQL_NUMERIC_VERSION    5.1.40              5.0.34
28
 
#  MYSQL_BASE_VERSION       5.1                 5.0
29
 
#  MYSQL_VERSION_ID         50140               50034
 
26
#  DRIZZLE_NO_DASH_VERSION    5.1.40sp1           5.0.34a
 
27
#  DRIZZLE_NUMERIC_VERSION    5.1.40              5.0.34
 
28
#  DRIZZLE_BASE_VERSION       5.1                 5.0
 
29
#  DRIZZLE_VERSION_ID         50140               50034
30
30
#
31
 
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
32
 
MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
33
 
MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
34
 
MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \
 
31
DRIZZLE_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
 
32
DRIZZLE_NUMERIC_VERSION=`echo $DRIZZLE_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
 
33
DRIZZLE_BASE_VERSION=`echo $DRIZZLE_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
 
34
DRIZZLE_VERSION_ID=`echo $DRIZZLE_NUMERIC_VERSION | \
35
35
    awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
36
36
 
37
37
# The port should be constant for a LONG time
63
63
AM_GNU_GETTEXT_VERSION(0.17)
64
64
 
65
65
 
66
 
AC_SUBST(MYSQL_NO_DASH_VERSION)
67
 
AC_SUBST(MYSQL_BASE_VERSION)
68
 
AC_SUBST(MYSQL_VERSION_ID)
69
 
AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION)
 
66
AC_SUBST(DRIZZLE_NO_DASH_VERSION)
 
67
AC_SUBST(DRIZZLE_BASE_VERSION)
 
68
AC_SUBST(DRIZZLE_VERSION_ID)
 
69
AC_SUBST(DRIZZLE_PREVIOUS_BASE_VERSION)
70
70
AC_SUBST(PROTOCOL_VERSION)
71
71
AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
72
72
                   [mysql client protocol version])
190
190
CC_VERSION=""
191
191
fi
192
192
AC_SUBST(CC_VERSION)
193
 
MYSQL_CHECK_CXX_VERSION
 
193
DRIZZLE_CHECK_CXX_VERSION
194
194
 
195
195
AC_PROG_AWK
196
196
 
279
279
  AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions -fno-rtti"
280
280
fi
281
281
 
282
 
MYSQL_PROG_AR
 
282
DRIZZLE_PROG_AR
283
283
 
284
284
# libdrizzle versioning when linked with GNU ld.
285
285
if $LD --version 2>/dev/null|grep -q GNU; then
451
451
#include <readline/readline.h>
452
452
]])
453
453
 
454
 
MYSQL_CHECK_NEW_RL_INTERFACE
 
454
DRIZZLE_CHECK_NEW_RL_INTERFACE
455
455
 
456
456
my_save_LIBS="$LIBS"
457
457
LIBS=""
632
632
AC_ARG_WITH([server-suffix],
633
633
    [AS_HELP_STRING([--with-server-suffix],
634
634
      [Append value to the version string.])],
635
 
    [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e  's/^\(...................................\)..*$/\1/'` ],
636
 
    [ MYSQL_SERVER_SUFFIX= ]
 
635
    [ DRIZZLE_SERVER_SUFFIX=`echo "$withval" | sed -e  's/^\(...................................\)..*$/\1/'` ],
 
636
    [ DRIZZLE_SERVER_SUFFIX= ]
637
637
    )
638
 
AC_SUBST(MYSQL_SERVER_SUFFIX)
 
638
AC_SUBST(DRIZZLE_SERVER_SUFFIX)
639
639
 
640
640
# Force use of a curses libs
641
641
AC_ARG_WITH([named-curses-libs],
709
709
  AC_MSG_RESULT([no])
710
710
fi
711
711
 
712
 
MYSQL_SYS_LARGEFILE
 
712
DRIZZLE_SYS_LARGEFILE
713
713
 
714
714
# Types that must be checked AFTER large file support is checked
715
715
AC_TYPE_SIZE_T
935
935
dnl check if time_t is unsigned
936
936
dnl
937
937
 
938
 
MYSQL_CHECK_TIME_T
 
938
DRIZZLE_CHECK_TIME_T
939
939
 
940
940
 
941
941
# do we need #pragma interface/#pragma implementation ?
953
953
AC_C_BIGENDIAN
954
954
#---START: Used in for client configure
955
955
# Check base type of last arg to accept
956
 
MYSQL_TYPE_ACCEPT
 
956
DRIZZLE_TYPE_ACCEPT
957
957
#---END:
958
958
# Figure out what type of struct rlimit to use with setrlimit
959
 
MYSQL_TYPE_STRUCT_RLIMIT
 
959
DRIZZLE_TYPE_STRUCT_RLIMIT
960
960
# Find where the stack goes
961
 
MYSQL_STACK_DIRECTION
 
961
DRIZZLE_STACK_DIRECTION
962
962
# We want to skip alloca on irix unconditionally. It may work on some version..
963
 
MYSQL_FUNC_ALLOCA
 
963
DRIZZLE_FUNC_ALLOCA
964
964
# Do struct timespec have members tv_sec or ts_sec
965
965
DRIZZLE_TIMESPEC_TS
966
966
# Do we have the tzname variable
967
 
MYSQL_TZNAME
 
967
DRIZZLE_TZNAME
968
968
# Do the c++ compiler have a bool type
969
 
MYSQL_CXX_BOOL
 
969
DRIZZLE_CXX_BOOL
970
970
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
971
971
AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
972
972
AC_CHECK_TYPES([u_int32_t])
973
973
 
974
 
MYSQL_PTHREAD_YIELD
 
974
DRIZZLE_PTHREAD_YIELD
975
975
 
976
976
 
977
977
dnl Checks for header files.
1009
1009
AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
1010
1010
 
1011
1011
AC_HEADER_STAT
1012
 
MYSQL_SIGNAL_CHECK
1013
 
MYSQL_CHECK_GETPW_FUNCS
1014
 
MYSQL_HAVE_TIOCGWINSZ
1015
 
MYSQL_HAVE_FIONREAD
1016
 
MYSQL_HAVE_TIOCSTAT
1017
 
MYSQL_STRUCT_DIRENT_D_INO
1018
 
MYSQL_STRUCT_DIRENT_D_NAMLEN
1019
 
MYSQL_TYPE_SIGHANDLER
1020
 
MYSQL_CHECK_MULTIBYTE
 
1012
DRIZZLE_SIGNAL_CHECK
 
1013
DRIZZLE_CHECK_GETPW_FUNCS
 
1014
DRIZZLE_HAVE_TIOCGWINSZ
 
1015
DRIZZLE_HAVE_FIONREAD
 
1016
DRIZZLE_HAVE_TIOCSTAT
 
1017
DRIZZLE_STRUCT_DIRENT_D_INO
 
1018
DRIZZLE_STRUCT_DIRENT_D_NAMLEN
 
1019
DRIZZLE_TYPE_SIGHANDLER
 
1020
DRIZZLE_CHECK_MULTIBYTE
1021
1021
if test "$with_named_curses" = "no"
1022
1022
then
1023
 
  MYSQL_CHECK_LIB_TERMCAP
 
1023
  DRIZZLE_CHECK_LIB_TERMCAP
1024
1024
else
1025
1025
  TERMCAP_LIBS="$with_named_curses"
1026
1026
fi
1056
1056
 
1057
1057
#AC_FUNC_MMAP
1058
1058
AC_TYPE_SIGNAL
1059
 
MYSQL_TYPE_QSORT
 
1059
DRIZZLE_TYPE_QSORT
1060
1060
AC_FUNC_UTIME_NULL
1061
1061
AC_FUNC_VPRINTF
1062
1062
 
1280
1280
# Check for requested features
1281
1281
#--------------------------------------------------------------------
1282
1282
 
1283
 
MYSQL_CHECK_BIG_TABLES
1284
 
MYSQL_CHECK_MAX_INDEXES
1285
 
MYSQL_CHECK_VIO
 
1283
DRIZZLE_CHECK_BIG_TABLES
 
1284
DRIZZLE_CHECK_MAX_INDEXES
 
1285
DRIZZLE_CHECK_VIO
1286
1286
 
1287
1287
#--------------------------------------------------------------------
1288
1288
# Declare our plugin modules
1290
1290
# functions tested above
1291
1291
#--------------------------------------------------------------------
1292
1292
 
1293
 
MYSQL_CONFIGURE_PLUGINS([none])
 
1293
DRIZZLE_CONFIGURE_PLUGINS([none])
1294
1294
 
1295
1295
AC_SUBST(mysql_plugin_dirs)
1296
1296
AC_SUBST(mysql_plugin_libs)