package/freeradius/patches/05-autoconf-rlm_sql_mysql.patch

   1 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure
   2 --- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure   2004-05-31 16:20:40.000000000 +0200
   3 +++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure      2005-03-13 23:05:13.000000000 +0100
   4 @@ -947,26 +947,6 @@
   5                 echo $ac_n "checking for mysql/mysql.h""... $ac_c" 1>&6
   6  echo "configure:949: checking for mysql/mysql.h" >&5
   7
   8 -               cat > conftest.$ac_ext <<EOF
   9 -#line 952 "configure"
  10 -#include "confdefs.h"
  11 -#include <mysql/mysql.h>
  12 -int main() {
  13 -int a = 1;
  14 -; return 0; }
  15 -EOF
  16 -if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  17 -  rm -rf conftest*
  18 -  MYSQL_INCLUDE=" "
  19 -else
  20 -  echo "configure: failed program was:" >&5
  21 -  cat conftest.$ac_ext >&5
  22 -  rm -rf conftest*
  23 -  MYSQL_INCLUDE=
  24 -
  25 -fi
  26 -rm -f conftest*
  27 -
  28                 if test "x$MYSQL_INCLUDE" = "x"; then
  29                         old_CFLAGS="$CFLAGS"
  30
  31 @@ -974,14 +954,14 @@
  32                         for try in $mysql_include_dir /usr/local/include /usr/local/mysql/include ; do
  33                                 CFLAGS="$old_CFLAGS -I$try"
  34                                 cat > conftest.$ac_ext <<EOF
  35 -#line 978 "configure"
  36 +#line 958 "configure"
  37  #include "confdefs.h"
  38  #include <mysql/mysql.h>
  39  int main() {
  40  int a = 1;
  41  ; return 0; }
  42  EOF
  43 -if { (eval echo configure:985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  44 +if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  45    rm -rf conftest*
  46    MYSQL_INCLUDE="-I$try"
  47  else
  48 @@ -1016,7 +996,7 @@
  49
  50
  51                         echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
  52 -echo "configure:1020: checking for mysql_init in -lmysqlclient" >&5
  53 +echo "configure:1000: checking for mysql_init in -lmysqlclient" >&5
  54
  55                         old_LIBS="$LIBS"
  56
  57 @@ -1024,14 +1004,14 @@
  58                         for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql; do
  59                                 LIBS="$old_LIBS -L$try -lmysqlclient"
  60                                 cat > conftest.$ac_ext <<EOF
  61 -#line 1028 "configure"
  62 +#line 1008 "configure"
  63  #include "confdefs.h"
  64  extern char mysql_init();
  65  int main() {
  66  mysql_init()
  67  ; return 0; }
  68  EOF
  69 -if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  70 +if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  71    rm -rf conftest*
  72    MYSQL_LIBS="-L$try -lmysqlclient $old_LIBS"
  73  else
  74 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in
  75 --- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in        2004-01-22 19:23:19.000000000 +0100
  76 +++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in   2005-03-13 23:05:13.000000000 +0100
  77 @@ -38,11 +38,6 @@
  78
  79                 AC_MSG_CHECKING([for mysql/mysql.h])
  80
  81 -               AC_TRY_COMPILE([#include <mysql/mysql.h>], [int a = 1;],
  82 -                       MYSQL_INCLUDE=" ",
  83 -                       MYSQL_INCLUDE=
  84 -               )
  85 -
  86                 if test "x$MYSQL_INCLUDE" = "x"; then
  87                         old_CFLAGS="$CFLAGS"
  88