diff options
author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-12 15:17:35 +0000 |
---|---|---|
committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-12 15:17:35 +0000 |
commit | b6547d17bc9d74d998958a3cf28739e4f6e5588c (patch) | |
tree | 139e64f4cccf9c5cb11f9b19dc6e82c05b2bdca6 /package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch | |
parent | ca2745c2818a64722ec0b159cd2a08eaf680652a (diff) |
update freeradius to new upstream release (v1.0.5) (closes: #190)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2936 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch')
-rw-r--r-- | package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch b/package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch new file mode 100644 index 000000000..9803a5fb6 --- /dev/null +++ b/package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch @@ -0,0 +1,88 @@ +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 +--- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure 2004-05-31 16:20:40.000000000 +0200 ++++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure 2005-03-13 23:05:13.000000000 +0100 +@@ -947,26 +947,6 @@ + echo $ac_n "checking for mysql/mysql.h""... $ac_c" 1>&6 + echo "configure:949: checking for mysql/mysql.h" >&5 + +- cat > conftest.$ac_ext <<EOF +-#line 952 "configure" +-#include "confdefs.h" +-#include <mysql/mysql.h> +-int main() { +-int a = 1; +-; return 0; } +-EOF +-if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- MYSQL_INCLUDE=" " +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- MYSQL_INCLUDE= +- +-fi +-rm -f conftest* +- + if test "x$MYSQL_INCLUDE" = "x"; then + old_CFLAGS="$CFLAGS" + +@@ -974,14 +954,14 @@ + for try in $mysql_include_dir /usr/local/include /usr/local/mysql/include ; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 978 "configure" ++#line 958 "configure" + #include "confdefs.h" + #include <mysql/mysql.h> + int main() { + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + MYSQL_INCLUDE="-I$try" + else +@@ -1016,7 +996,7 @@ + + + echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6 +-echo "configure:1020: checking for mysql_init in -lmysqlclient" >&5 ++echo "configure:1000: checking for mysql_init in -lmysqlclient" >&5 + + old_LIBS="$LIBS" + +@@ -1024,14 +1004,14 @@ + for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql; do + LIBS="$old_LIBS -L$try -lmysqlclient" + cat > conftest.$ac_ext <<EOF +-#line 1028 "configure" ++#line 1008 "configure" + #include "confdefs.h" + extern char mysql_init(); + int main() { + mysql_init() + ; return 0; } + EOF +-if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + MYSQL_LIBS="-L$try -lmysqlclient $old_LIBS" + else +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 +--- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in 2004-01-22 19:23:19.000000000 +0100 ++++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in 2005-03-13 23:05:13.000000000 +0100 +@@ -38,11 +38,6 @@ + + AC_MSG_CHECKING([for mysql/mysql.h]) + +- AC_TRY_COMPILE([#include <mysql/mysql.h>], [int a = 1;], +- MYSQL_INCLUDE=" ", +- MYSQL_INCLUDE= +- ) +- + if test "x$MYSQL_INCLUDE" = "x"; then + old_CFLAGS="$CFLAGS" + |