| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Fri, 07 Apr 2017 17:56:36 -0700 | |
| changeset 7851 | f82a18f72950 |
| parent 6547 | 293f85a96c96 |
| permissions | -rw-r--r-- |
|
6547
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: submitted to upstream |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
https://bz.apache.org/bugzilla/show_bug.cgi?id=59927 |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- build/dbd.m4 |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ build/dbd.m4 |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
@@ -177,12 +177,12 @@ |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
fi |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
- AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
[apu_have_mysql=0; break], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
[#include <my_global.h>]) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
if test "$apu_have_mysql" = "0"; then |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
- AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
[apu_have_mysql=0; break], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
[#include <mysql/my_global.h>]) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
fi |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
@@ -208,13 +208,13 @@ |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
|
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
AC_MSG_NOTICE(checking for mysql in $withval) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
- AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
[apu_have_mysql=0; break], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
[#include <my_global.h>]) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
|
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
if test "$apu_have_mysql" != "1"; then |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
- AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
[apu_have_mysql=0; break], |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
[#include <mysql/my_global.h>]) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
fi |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
@@ -229,7 +229,7 @@ |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
dnl Since we have already done the AC_CHECK_LIB tests, if we have it, |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
dnl we know the library is there. |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
if test "$apu_have_mysql" = "1"; then |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS]) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
fi |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
AC_SUBST(LDADD_dbd_mysql) |
|
293f85a96c96
24351403 pkg:/library/apr-util-15/dbd-mysql depends on pkg:/database/mysql-55/library
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |