| 1 |
maksbotan 13/03/30 14:57:53 |
| 2 |
|
| 3 |
Added: mysql_check.patch |
| 4 |
Log: |
| 5 |
Fix compilation with MySQL, bug #463570. Thanks to slepnoga. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/sagan/files/mysql_check.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sagan/files/mysql_check.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sagan/files/mysql_check.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mysql_check.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.in b/configure.ac |
| 18 |
rename from configure.in |
| 19 |
rename to configure.ac |
| 20 |
--- a/configure.in |
| 21 |
+++ b/configure.ac |
| 22 |
@@ -215,13 +215,17 @@ |
| 23 |
AC_CHECK_LIB(pthread, main,,AC_MSG_ERROR(Sagan needs pthreads!)) |
| 24 |
AC_CHECK_LIB(m, main,,AC_MSG_ERROR(Sagan needs libm!)) |
| 25 |
|
| 26 |
+save_LIBS=$LIBS |
| 27 |
if test "$MYSQL" = "yes"; then |
| 28 |
AC_MSG_RESULT([------- MySQL support is enabled -------]) |
| 29 |
+ AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config) |
| 30 |
AC_CHECK_HEADER([mysql/mysql.h]) |
| 31 |
AC_CHECK_HEADER([mysql/errmsg.h]) |
| 32 |
- AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing! |
| 33 |
-If you're not interested in MySQL support use the --disable-mysql flag.)) |
| 34 |
- fi |
| 35 |
+ LIBS=$(mysql_config --libs_r) |
| 36 |
+ AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!)) |
| 37 |
+fi |
| 38 |
+LIBS="$save_LIBS $LIBS" |
| 39 |
+ |
| 40 |
|
| 41 |
if test "$POSTGRES" = "yes"; then |
| 42 |
AC_MSG_RESULT([------- PostgreSQL support is enabled -------]) |
Archives