sources/mysql/configure.patch

   1 --- mysql-4.1.22/configure.in.orig      2006-11-02 18:15:41.000000000 -0800
   2 +++ mysql-4.1.22/configure.in   2008-04-16 18:01:08.000000000 -0700
   3 @@ -51,7 +51,7 @@
   4        ;;
   5      *)
   6    echo "$i/errmsg.sys: $i/errmsg.txt
   7 -       \$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \
   8 +       \$(COMP_ERR) -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \
   9      >> $AVAILABLE_LANGUAGES_ERRORS_RULES
  10        ;;
  11    esac
  12 @@ -265,6 +265,9 @@
  13    *netware*)
  14      AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
  15      ;;
  16 +  *linux*)
  17 +    AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
  18 +    ;;
  19    *)
  20  AC_TRY_RUN([
  21    int main()
  22 @@ -883,38 +886,6 @@
  23    AC_LANG_SAVE
  24    AC_LANG_CPLUSPLUS
  25
  26 -  atom_ops=
  27 -  AC_TRY_RUN([
  28 -#include <asm/atomic.h>
  29 -int main()
  30 -{
  31 -  atomic_t v;
  32 -
  33 -  atomic_set(&v, 23);
  34 -  atomic_add(5, &v);
  35 -  return atomic_read(&v) == 28 ? 0 : -1;
  36 -}
  37 -  ],
  38 -  [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
  39 -             [atomic_add() from <asm/atomic.h> (Linux only)])
  40 -   atom_ops="${atom_ops}atomic_add "],
  41 -  )
  42 -  AC_TRY_RUN([
  43 -#include <asm/atomic.h>
  44 -int main()
  45 -{
  46 -  atomic_t v;
  47 -
  48 -  atomic_set(&v, 23);
  49 -  atomic_sub(5, &v);
  50 -  return atomic_read(&v) == 18 ? 0 : -1;
  51 -}
  52 -  ],
  53 -  [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
  54 -             [atomic_sub() from <asm/atomic.h> (Linux only)])
  55 -   atom_ops="${atom_ops}atomic_sub "],
  56 -  )
  57 -
  58    if test -z "$atom_ops"; then atom_ops="no"; fi
  59    AC_MSG_RESULT($atom_ops)
  60
  61 @@ -976,6 +947,9 @@
  62    *netware)
  63      AC_MSG_RESULT([no])
  64      ;;
  65 +  *linux*)
  66 +    AC_MSG_RESULT([no])
  67 +    ;;
  68    *)
  69  AC_TRY_RUN([
  70  #ifdef HAVE_STDLIB_H
  71 @@ -1330,7 +1304,7 @@
  72            # old method, check headers
  73            # Look for LinuxThreads.
  74            AC_MSG_CHECKING("LinuxThreads in header file comment")
  75 -          res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
  76 +          res=1#`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
  77            if test "$res" -gt 0
  78            then
  79              AC_MSG_RESULT("Found")
  80 @@ -1859,20 +1833,6 @@
  81  MYSQL_CHECK_IN_ADDR_T
  82  # Do the c++ compiler have a bool type
  83  MYSQL_CXX_BOOL
  84 -# Check some common bugs with gcc 2.8.# on sparc
  85 -if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then
  86 -MYSQL_CHECK_LONGLONG_TO_FLOAT
  87 -if test "$ac_cv_conv_longlong_to_float" != "yes"
  88 -then
  89 -  AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
  90 -If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
  91 -again]);
  92 -fi
  93 -fi
  94 -AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
  95 -AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
  96 -AC_CHECK_TYPES([u_int32_t])
  97 -
  98  MYSQL_PTHREAD_YIELD
  99
 100  ######################################################################