From 984e89a815c1421c22da5a6434dd83789c77e1c2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 23 Mar 2023 02:17:19 +0200 Subject: [PATCH 45/45] mysql.m4: Set up file header from upstream sources - Update freeciv related note to document correct upstream location - Include the upstream header See osdn #45725 Signed-off-by: Marko Lindqvist --- m4/mysql.m4 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/m4/mysql.m4 b/m4/mysql.m4 index 021d774859..8e9d74e165 100644 --- a/m4/mysql.m4 +++ b/m4/mysql.m4 @@ -1,9 +1,53 @@ -# Check for mysql -# -# http://ac-archive.sourceforge.net/ac-archive/ax_lib_mysql.html -# Modified for freeciv use. # # FC_CHECK_MYSQL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND[, VERSION]]]) +# Modified version of AX_LIB_MYSQL(), for freeciv use. +# Header of original AX_LIB_MYSQL() below. +# Upstream version is that of 2009-04-27 from +# https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=history;f=m4/ax_lib_mysql.m4 + +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_lib_mysql.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_MYSQL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of MySQL client library of +# particular version or newer. +# +# AX_LIB_MYSQL macro takes only one argument which is optional. If there +# is no required version passed, then macro does not run version test. +# +# The --with-mysql option takes one of three possible values: +# +# no - do not check for MySQL client library +# +# yes - do check for MySQL library in standard locations (mysql_config +# should be in the PATH) +# +# path - complete path to mysql_config utility, use this option if +# mysql_config can't be found in the PATH +# +# This macro calls: +# +# AC_SUBST(MYSQL_CFLAGS) +# AC_SUBST(MYSQL_LDFLAGS) +# AC_SUBST(MYSQL_VERSION) +# +# And sets: +# +# HAVE_MYSQL +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. AC_DEFUN([FC_CHECK_MYSQL], [ @@ -31,7 +75,7 @@ AC_DEFUN([FC_CHECK_MYSQL], mysql_ldflags="`$MYSQL_CONFIG --libs`" MYSQL_VERSION=`$MYSQL_CONFIG --version` - # remove NDEBUG from MYSQL_CFLAGS + # Remove NDEBUG from MYSQL_CFLAGS mysql_cflags=`echo $mysql_cflags | $SED -e 's/-DNDEBUG//g'` found_mysql="yes" -- 2.39.2