Commit 4c8decfb authored by unknown's avatar unknown
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
parents 598c0526 d2880dbe

config/ac-macros/misc.m4

+24 −0
Original line number Diff line number Diff line
@@ -790,3 +790,27 @@ esac 
AC_SUBST(AR)

AC_SUBST(ARFLAGS)

])



dnl

dnl  Macro to check time_t range: according to C standard

dnl  array index must be greater than 0 => if time_t is signed,

dnl  the code in the macros below won't compile.

dnl



AC_DEFUN([MYSQL_CHECK_TIME_T],[

    AC_MSG_CHECKING(if time_t is unsigned)

    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(

        [[

#include <time.h>

        ]],

        [[

        int array[(((time_t)-1) > 0) ? 1 : -1];

        ]] )

    ], [

    AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])

    AC_MSG_RESULT(yes)

    ],

    [AC_MSG_RESULT(no)]

    )

])

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ NDB_VERSION_STATUS="" 
# Remember that regexps needs to quote [ and ] since this is run through m4

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`

MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`

MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`

MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION | sed -e 's|[[^0-9.]].*$||;s|$|.|' | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`



# The port should be constant for a LONG time

MYSQL_TCP_PORT_DEFAULT=3306