diff options
author | unknown <monty@hundin.mysql.fi> | 2002-01-26 01:19:47 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-01-26 01:19:47 +0200 |
commit | 746e149eefe935c672bb438a7703c7d0c0ae58ca (patch) | |
tree | 5ccc31c365805428193f80c2e7fe45e9c87a8173 /acinclude.m4 | |
parent | c957dfc4ce1751f34af33f46e14a7f6e3ce8bb5c (diff) | |
download | mariadb-git-746e149eefe935c672bb438a7703c7d0c0ae58ca.tar.gz |
Update needed for SuSE 7.3
Update for autoconf 2.52
BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8:
Delete: BUILD/compile-pentium-symbols
BUILD/Makefile.am:
Remove not used scripts
BUILD/SETUP.sh:
Update needed for SuSE 7.3
BUILD/compile-alpha:
Update needed for SuSE 7.3
BUILD/compile-pentium-debug-no-bdb:
Update needed for SuSE 7.3
BUILD/compile-pentium-gcov:
Update needed for SuSE 7.3
BUILD/compile-pentium-gprof:
Update needed for SuSE 7.3
BUILD/compile-pentium-mysqlfs-debug:
Update needed for SuSE 7.3
BUILD/compile-pentium:
Update needed for SuSE 7.3
Docs/manual.texi:
changelog
Docs/mysqld_error.txt:
New error messages.
acconfig.h:
Update to autoconf 2.52
acinclude.m4:
Update to autoconf 2.52
bdb/dist/configure.in:
Update to autoconf 2.52
configure.in:
Update to autoconf 2.52
myisam/mi_check.c:
Fix for myisamchk bug when reparing table with many keys.
myisam/mi_key.c:
Fix problem with NAN in key's
scripts/Makefile.am:
Fix for autoconf 2.52
scripts/mysql_new_fix_privilege_tables.sh:
cleanup
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 907202ac757..830157423c1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -315,14 +315,6 @@ case "x$am_cv_prog_cc_stdc" in esac ]) -# serial 1 - -AC_DEFUN(AM_PROG_INSTALL, -[AC_REQUIRE([AC_PROG_INSTALL]) -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -AC_SUBST(INSTALL_SCRIPT)dnl -]) - # # Check to make sure that the build environment is sane. # @@ -527,7 +519,7 @@ fi ])dnl AC_DEFUN(MYSQL_STACK_DIRECTION, - AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, + [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, [AC_TRY_RUN([find_stack_direction () { static char *addr = 0; @@ -546,7 +538,7 @@ AC_DEFUN(MYSQL_STACK_DIRECTION, }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, ac_cv_c_stack_direction=0)]) AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) -)dnl +])dnl AC_DEFUN(MYSQL_FUNC_ALLOCA, [ @@ -643,7 +635,8 @@ AC_MSG_RESULT($ac_cv_conv_longlong_to_float) ]) AC_DEFUN(MYSQL_CHECK_CPU, -AC_CACHE_CHECK([if compiler supports optimizations for current cpu], mysql_cv_cpu,[ +[AC_CACHE_CHECK([if compiler supports optimizations for current cpu], +mysql_cv_cpu,[ ac_save_CFLAGS="$CFLAGS" if test -r /proc/cpuinfo ; then @@ -686,7 +679,7 @@ then else AC_MSG_RESULT($mysql_cv_cpu) fi -])) +]])) AC_DEFUN(MYSQL_CHECK_VIO, [ AC_ARG_WITH([vio], @@ -755,7 +748,19 @@ AC_MSG_CHECKING(for OpenSSL) openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" openssl_includes="-I$OPENSSL_INCLUDE" AC_DEFINE(HAVE_OPENSSL) - else + + # openssl-devel-0.9.6 requires dlopen() and we can't link staticly + # on many platforms (We should actually test this here, but it's quite + # hard) to do as we are doing libtool for linking. + using_static="" + case "$CLIENT_EXTRA_LDFLAGS $MYSQLD_EXTRA_LDFLAGS" in + *-all-static*) using_static="yes" ;; + esac + if test $using_static = "yes" + then + echo "You can't use the --all-static link option when using openssl." + exit 1 + fi AC_MSG_RESULT(no) fi NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs" @@ -1258,9 +1263,9 @@ changequote([, ])dnl AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) fi]) -AC_DEFUN(AC_SYS_LARGEFILE, +AC_DEFUN(MYSQL_SYS_LARGEFILE, [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_ENABLE(largefile, + AC_ARG_ENABLE(largefile, [ --disable-largefile Omit support for large files]) if test "$enable_largefile" != no; then AC_CHECK_TOOL(GETCONF, getconf) |