From 3bf11c468b3453a074e67103124a72f552841162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Mon, 3 May 2010 13:26:21 +0200 Subject: [PATCH] Allow cross compilation. Thanks to Marc Dirix <marc@electronics-design.nl> for noting the issue. Rev: src/modules/Mysql/configure.in:1.62 --- src/modules/Mysql/configure.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/Mysql/configure.in b/src/modules/Mysql/configure.in index c7c73056f1..f6e06a6846 100644 --- a/src/modules/Mysql/configure.in +++ b/src/modules/Mysql/configure.in @@ -1,5 +1,5 @@ # -# $Id: configure.in,v 1.61 2008/07/18 18:20:15 mast Exp $ +# $Id: configure.in,v 1.62 2010/05/03 11:26:21 grubba Exp $ # # Configure script for the mysql-module # @@ -324,7 +324,7 @@ int main(int argc, char *argv[]) { #ifdef MYSQL_VERSION_ID unsigned long ver = mysql_get_client_version(); - if(ver != MYSQL_VERSION_ID) { + if((ver/100) != (MYSQL_VERSION_ID/100)) { fprintf(stderr, "Version mismatch: compile=%lu, run=%lu\n", (unsigned long)MYSQL_VERSION_ID, ver); exit(1); @@ -335,7 +335,10 @@ int main(int argc, char *argv[]) AC_MSG_WARN([Header version does not match library version, diabling module]) PIKE_FEATURE(Mysql,[no (header/library mismatch)]) pike_cv_mysql=no - ],[]) + ],[ + # Cross-compiling. + : + ]) ],[]) fi -- GitLab