Commit a6bcf22b authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files

Merge mysql.com:/home/kent/bk/build/mysql-4.0 

into  mysql.com:/home/kent/bk/build/mysql-4.1-build
parents dc1fb075 9023b3a3

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -1095,11 +1095,11 @@ AC_MSG_CHECKING(for OpenSSL) 
    AC_MSG_RESULT(no)

	if test ! -z "$openssl_includes"

	then

		AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl);

		AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl)

	fi

	if test ! -z "$openssl_libs"

	then

		AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl);

		AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl)

	fi

  fi

  AC_SUBST(openssl_libs)

configure.in

+15 −15
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ CC_VERSION=`$CC --version | sed 1q` 
esac

if test $? -eq "0"

then

  AC_MSG_CHECKING("C Compiler version");

  AC_MSG_CHECKING("C Compiler version")

  AC_MSG_RESULT("$CC $CC_VERSION")

else

CC_VERSION=""
@@ -220,7 +220,7 @@ CXX_VERSION=`$CXX --version | sed 1q` 
esac

if test $? -eq "0"

then

  AC_MSG_CHECKING("C++ compiler version");

  AC_MSG_CHECKING("C++ compiler version")

  AC_MSG_RESULT("$CXX $CXX_VERSION")

else

CXX_VERSION=""
@@ -1369,7 +1369,7 @@ See the Installation chapter in the Reference Manual for more information.]) 
            AC_MSG_RESULT("no need to check headers")

        fi

        

        AC_MSG_CHECKING("for pthread_create in -lpthread");

        AC_MSG_CHECKING("for pthread_create in -lpthread")

        ac_save_LIBS="$LIBS"

        LIBS="$LIBS -lpthread"

        AC_TRY_LINK( [#include <pthread.h>],
@@ -1429,7 +1429,7 @@ then 
      then

	AC_MSG_RESULT("yes")

      else

	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]);

	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])

      fi

      AC_MSG_RESULT("yes")

    elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
@@ -1445,7 +1445,7 @@ then 
      then

	AC_MSG_RESULT("yes")

      else

	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]);

	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])

      fi

      AC_MSG_RESULT("yes")

    # Hack for SCO UnixWare 7.1.x
@@ -1487,7 +1487,7 @@ then 
        AC_MSG_RESULT("no")

      fi

    else

      AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.]);

      AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.])

    fi

  else

    AC_MSG_RESULT("no")
@@ -1585,7 +1585,7 @@ else 
  if test "$with_mit_threads" = "no"

  then

    # pthread_create is in standard libraries (As in BSDI 3.0)

    AC_MSG_CHECKING("for pthread_create in -libc");

    AC_MSG_CHECKING("for pthread_create in -libc")

    AC_TRY_LINK(

    [#include <pthread.h>],

    [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1593,7 +1593,7 @@ else 
    AC_MSG_RESULT("$with_posix_threads")

    if test "$with_posix_threads" = "no"

    then

      AC_MSG_CHECKING("for pthread_create in -lpthread");

      AC_MSG_CHECKING("for pthread_create in -lpthread")

      ac_save_LIBS="$LIBS"

      LIBS="$LIBS -lpthread"

      AC_TRY_LINK(
@@ -1604,7 +1604,7 @@ else 
      if test "$with_posix_threads" = "no"

      then

        LIBS=" $ac_save_LIBS -lpthreads"

        AC_MSG_CHECKING("for pthread_create in -lpthreads");

        AC_MSG_CHECKING("for pthread_create in -lpthreads")

        AC_TRY_LINK(

        [#include <pthread.h>],

        [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1614,7 +1614,7 @@ else 
        then

	  # This is for FreeBSD

	  LIBS="$ac_save_LIBS -pthread"

	  AC_MSG_CHECKING("for pthread_create in -pthread");

	  AC_MSG_CHECKING("for pthread_create in -pthread")

	  AC_TRY_LINK(

	  [#include <pthread.h>],

	  [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1895,7 +1895,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes" 
then

  AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!

If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try

again]);

again])

fi

fi

AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
@@ -2047,7 +2047,7 @@ CFLAGS="$ORG_CFLAGS" 
AC_CHECK_FUNC(fseeko,

[if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";

then

  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!");

  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!")

fi]

)
@@ -2740,7 +2740,7 @@ do 
      ;;

    *)

      AC_MSG_ERROR([Charset '$cs' not available. (Available are: $CHARSETS_AVAILABLE).

      See the Installation chapter in the Reference Manual.]);

      See the Installation chapter in the Reference Manual.])

  esac

done
@@ -2917,7 +2917,7 @@ case $default_charset in 
      ;;

    *)

      AC_MSG_ERROR([Charset $cs not available. (Available are: $CHARSETS_AVAILABLE).

      See the Installation chapter in the Reference Manual.]);

      See the Installation chapter in the Reference Manual.])

esac



if test "$default_collation" = default; then
@@ -2942,7 +2942,7 @@ else 
      Collation $default_collation is not valid for character set $default_charset.

      Valid collations are: $default_charset_collations.

      See the Installation chapter in the Reference Manual.

  ]);

  ])

fi



AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"],