From 44101be7accab13b862732b7f48450f127751e09 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 15 Aug 2020 15:07:10 +0000 Subject: [PATCH] updated ax_lib_mysql.m4 --- hawk/Makefile.in | 2 + hawk/bin/Makefile.in | 2 + hawk/configure | 176 +++++++++++++++++++++++++++++++++------ hawk/configure.ac | 4 + hawk/lib/Makefile.in | 2 + hawk/m4/ax_lib_mysql.m4 | 104 ++++++++++++++++------- hawk/mod/Makefile.am | 2 +- hawk/mod/Makefile.in | 5 +- hawk/mod/mod-mysql.c | 2 +- hawk/samples/Makefile.in | 2 + hawk/t/Makefile.in | 2 + hawk/tools/Makefile.in | 2 + 12 files changed, 245 insertions(+), 60 deletions(-) diff --git a/hawk/Makefile.in b/hawk/Makefile.in index a6c4c09a..199170e3 100644 --- a/hawk/Makefile.in +++ b/hawk/Makefile.in @@ -287,6 +287,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -365,6 +366,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/hawk/bin/Makefile.in b/hawk/bin/Makefile.in index 6ef346ec..02e6dd9a 100644 --- a/hawk/bin/Makefile.in +++ b/hawk/bin/Makefile.in @@ -256,6 +256,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -334,6 +335,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/hawk/configure b/hawk/configure index 4e0f5aa2..12cc28e3 100755 --- a/hawk/configure +++ b/hawk/configure @@ -668,6 +668,7 @@ PACKAGE_VERSION_PATCH PACKAGE_VERSION_MINOR PACKAGE_VERSION_MAJOR QUADMATH_LIBS +MYSQL_LIBS MYSQL_LDFLAGS MYSQL_CFLAGS MYSQL_VERSION @@ -794,6 +795,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -854,8 +856,7 @@ CXXFLAGS CCC LT_SYS_LIBRARY_PATH CPP -CXXCPP -MYSQL_CONFIG' +CXXCPP' # Initialize some variables set by options. @@ -894,6 +895,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1146,6 +1148,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1283,7 +1294,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1436,6 +1447,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1514,7 +1526,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-mysql=[ARG] use MySQL client library [default=yes], optionally + --with-mysql[=ARG] use MySQL client library [default=no], optionally specify path to mysql_config Some influential environment variables: @@ -1531,8 +1543,6 @@ Some influential environment variables: User-defined run-time library search path. CPP C preprocessor CXXCPP C++ preprocessor - MYSQL_CONFIG - Full path to mysql_config program Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -18055,7 +18065,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18101,7 +18111,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18125,7 +18135,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18170,7 +18180,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18194,7 +18204,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -20359,6 +20369,8 @@ fi + MYSQL_CONFIG="no" + # Check whether --with-mysql was given. if test "${with_mysql+set}" = set; then : @@ -20373,21 +20385,20 @@ if test "${with_mysql+set}" = set; then : fi else - want_mysql="yes" + want_mysql="no" fi - MYSQL_CFLAGS="" MYSQL_LDFLAGS="" + MYSQL_LIBS="" MYSQL_VERSION="" if test "$want_mysql" = "yes"; then - if test -z "$MYSQL_CONFIG" ; then - for ac_prog in mysql_config mysql_config5 + for ac_prog in mysql_config mariadb_config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -20431,16 +20442,133 @@ fi test -n "$MYSQL_CONFIG" && break done -test -n "$MYSQL_CONFIG" || MYSQL_CONFIG="no" - fi - if test "$MYSQL_CONFIG" != "no"; then + if test -x "$MYSQL_CONFIG"; then MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" - MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" + _full_libmysql_libs="`$MYSQL_CONFIG --libs`" + + _save_mysql_ldflags="${LDFLAGS}" + _save_mysql_cflags="${CFLAGS}" + LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}" + CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}" + + for i in $_full_libmysql_libs; do + case $i in + -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb) + + _lib_name="`echo "$i" | cut -b3-`" + as_ac_Lib=`$as_echo "ac_cv_lib_$_lib_name''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_lib_name" >&5 +$as_echo_n "checking for main in -l$_lib_name... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$_lib_name $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}" + +else + + as_fn_error $? "Not found $_lib_name library" "$LINENO" 5 + +fi + + ;; + -L*) + + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i" + ;; + -R*) + + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} -Wl,$i" + ;; + -l*) + + _lib_name="`echo "$i" | cut -b3-`" + as_ac_Lib=`$as_echo "ac_cv_lib_$_lib_name''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_lib_name" >&5 +$as_echo_n "checking for main in -l$_lib_name... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$_lib_name $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + MYSQL_LIBS="${MYSQL_LIBS} ${i}" + +else + + as_fn_error $? "Not found $i library" "$LINENO" 5 + +fi + + ;; + esac + done + + LDFLAGS="${_save_mysql_ldflags}" + CFLAGS="${_save_mysql_cflags}" + unset _save_mysql_ldflags + unset _save_mysql_cflags MYSQL_VERSION=`$MYSQL_CONFIG --version` + +$as_echo "#define HAVE_MYSQL 1" >>confdefs.h + + found_mysql="yes" else found_mysql="no" @@ -20448,7 +20576,6 @@ test -n "$MYSQL_CONFIG" || MYSQL_CONFIG="no" fi - mysql_version_req= if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then @@ -20488,11 +20615,6 @@ $as_echo "no" >&6; } fi fi - if test "$found_mysql" = "yes" ; then - -$as_echo "#define HAVE_MYSQL 1" >>confdefs.h - - fi @@ -23942,6 +24064,10 @@ else fi +if test "x${found_mysql}" != "xyes" +then + enable_mod_mysql_is="no" +fi if test "${enable_mod_mysql_is}" = "yes" then diff --git a/hawk/configure.ac b/hawk/configure.ac index 24cdbb23..22a9422c 100644 --- a/hawk/configure.ac +++ b/hawk/configure.ac @@ -964,6 +964,10 @@ AC_ARG_ENABLE([mod-mysql], enable_mod_mysql_is=$enableval, enable_mod_mysql_is=yes ) +if test "x${found_mysql}" != "xyes" +then + enable_mod_mysql_is="no" +fi if test "${enable_mod_mysql_is}" = "yes" then AC_DEFINE([HAWK_ENABLE_MOD_MYSQL],[1],[build mod/mysql]) diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index 436d8314..3a82fb86 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -479,6 +479,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -557,6 +558,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/hawk/m4/ax_lib_mysql.m4 b/hawk/m4/ax_lib_mysql.m4 index 2ae2a9ef..6d8de6a0 100644 --- a/hawk/m4/ax_lib_mysql.m4 +++ b/hawk/m4/ax_lib_mysql.m4 @@ -1,6 +1,4 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_lib_mysql.html -# =========================================================================== +##### http://autoconf-archive.cryp.to/ax_lib_mysql.html # # SYNOPSIS # @@ -8,18 +6,19 @@ # # DESCRIPTION # -# This macro provides tests of availability of MySQL client library of -# particular version or newer. +# 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. +# 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) +# 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 @@ -28,28 +27,32 @@ # # AC_SUBST(MYSQL_CFLAGS) # AC_SUBST(MYSQL_LDFLAGS) +# AC_SUBST(MYSQL_LIBS) # AC_SUBST(MYSQL_VERSION) # # And sets: # # HAVE_MYSQL # -# LICENSE +# LAST MODIFICATION # -# Copyright (c) 2008 Mateusz Loskot +# 2006-07-16 # -# 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. This file is offered as-is, without any -# warranty. - -#serial 13 +# COPYLEFT +# +# Copyright (c) 2006 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([AX_LIB_MYSQL], [ + MYSQL_CONFIG="no" + AC_ARG_WITH([mysql], - AS_HELP_STRING([--with-mysql=@<:@ARG@:>@], - [use MySQL client library @<:@default=yes@:>@, optionally specify path to mysql_config] + AC_HELP_STRING([--with-mysql@<:@=ARG@:>@], + [use MySQL client library @<:@default=no@:>@, optionally specify path to mysql_config] ), [ if test "$withval" = "no"; then @@ -61,12 +64,12 @@ AC_DEFUN([AX_LIB_MYSQL], MYSQL_CONFIG="$withval" fi ], - [want_mysql="yes"] + [want_mysql="no"] ) - AC_ARG_VAR([MYSQL_CONFIG], [Full path to mysql_config program]) MYSQL_CFLAGS="" MYSQL_LDFLAGS="" + MYSQL_LIBS="" MYSQL_VERSION="" dnl @@ -75,15 +78,57 @@ AC_DEFUN([AX_LIB_MYSQL], if test "$want_mysql" = "yes"; then - if test -z "$MYSQL_CONFIG" ; then - AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mysql_config5], [no]) - fi + AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config) - if test "$MYSQL_CONFIG" != "no"; then + if test -x "$MYSQL_CONFIG"; then MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" - MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" + _full_libmysql_libs="`$MYSQL_CONFIG --libs`" + _save_mysql_ldflags="${LDFLAGS}" + _save_mysql_cflags="${CFLAGS}" + LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}" + CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}" + + for i in $_full_libmysql_libs; do + case $i in + -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb) + + _lib_name="`echo "$i" | cut -b3-`" + AC_CHECK_LIB($_lib_name, main, [ + MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}" + ],[ + AC_MSG_ERROR([Not found $_lib_name library]) + ]) + ;; + -L*) + + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i" + ;; + -R*) + + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} -Wl,$i" + ;; + -l*) + + _lib_name="`echo "$i" | cut -b3-`" + AC_CHECK_LIB($_lib_name, main, [ + MYSQL_LIBS="${MYSQL_LIBS} ${i}" + ],[ + AC_MSG_ERROR([Not found $i library]) + ]) + ;; + esac + done + + LDFLAGS="${_save_mysql_ldflags}" + CFLAGS="${_save_mysql_cflags}" + unset _save_mysql_ldflags + unset _save_mysql_cflags + MYSQL_VERSION=`$MYSQL_CONFIG --version` + + AC_DEFINE([HAVE_MYSQL], [1], + [Define to 1 if MySQL libraries are available]) found_mysql="yes" else @@ -95,7 +140,6 @@ AC_DEFUN([AX_LIB_MYSQL], dnl Check if required version of MySQL is available dnl - mysql_version_req=ifelse([$1], [], [], [$1]) if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then @@ -136,12 +180,8 @@ AC_DEFUN([AX_LIB_MYSQL], fi fi - if test "$found_mysql" = "yes" ; then - AC_DEFINE([HAVE_MYSQL], [1], - [Define to 1 if MySQL libraries are available]) - fi - AC_SUBST([MYSQL_VERSION]) AC_SUBST([MYSQL_CFLAGS]) AC_SUBST([MYSQL_LDFLAGS]) + AC_SUBST([MYSQL_LIBS]) ]) diff --git a/hawk/mod/Makefile.am b/hawk/mod/Makefile.am index 8a6d4fce..cece8b1c 100644 --- a/hawk/mod/Makefile.am +++ b/hawk/mod/Makefile.am @@ -62,7 +62,7 @@ if ENABLE_MOD_MYSQL libhawk_mysql_la_SOURCES = mod-mysql.c mod-mysql.h libhawk_mysql_la_CPPFLAGS = $(CPPFLAGS_COMMON) $(MYSQL_CFLAGS) libhawk_mysql_la_LDFLAGS = $(LDFLAGS_COMMON) $(MYSQL_LDFLAGS) -libhawk_mysql_la_LIBADD = $(LIBADD_COMMON) +libhawk_mysql_la_LIBADD = $(LIBADD_COMMON) $(MYSQL_LIBS) endif if ENABLE_MOD_UCI diff --git a/hawk/mod/Makefile.in b/hawk/mod/Makefile.in index 633af056..e61b89a6 100644 --- a/hawk/mod/Makefile.in +++ b/hawk/mod/Makefile.in @@ -141,6 +141,7 @@ am__installdirs = "$(DESTDIR)$(pkgmodexecdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkgmodexec_LTLIBRARIES) am__DEPENDENCIES_1 = @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_DEPENDENCIES = \ +@ENABLE_MOD_MYSQL_TRUE@ $(am__DEPENDENCIES_1) \ @ENABLE_MOD_MYSQL_TRUE@ $(am__DEPENDENCIES_1) am__libhawk_mysql_la_SOURCES_DIST = mod-mysql.c mod-mysql.h @ENABLE_MOD_MYSQL_TRUE@am_libhawk_mysql_la_OBJECTS = \ @@ -311,6 +312,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -389,6 +391,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -438,7 +441,7 @@ CPPFLAGS_COMMON = \ @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_SOURCES = mod-mysql.c mod-mysql.h @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_CPPFLAGS = $(CPPFLAGS_COMMON) $(MYSQL_CFLAGS) @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_LDFLAGS = $(LDFLAGS_COMMON) $(MYSQL_LDFLAGS) -@ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_LIBADD = $(LIBADD_COMMON) +@ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_LIBADD = $(LIBADD_COMMON) $(MYSQL_LIBS) @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_SOURCES = mod-uci.c mod-uci.h @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_CPPFLAGS = $(CPPFLAGS_COMMON) @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_LDFLAGS = $(LDFLAGS_COMMON) diff --git a/hawk/mod/mod-mysql.c b/hawk/mod/mod-mysql.c index 0d2dc85a..0424ee07 100644 --- a/hawk/mod/mod-mysql.c +++ b/hawk/mod/mod-mysql.c @@ -25,7 +25,7 @@ */ #include "mod-mysql.h" -#include +#include #include "../lib/hawk-prv.h" #if !defined(MYSQL_OPT_RECONNECT) diff --git a/hawk/samples/Makefile.in b/hawk/samples/Makefile.in index aac3fa7c..03d36ff0 100644 --- a/hawk/samples/Makefile.in +++ b/hawk/samples/Makefile.in @@ -284,6 +284,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -362,6 +363,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/hawk/t/Makefile.in b/hawk/t/Makefile.in index 8e20c584..15d50cce 100644 --- a/hawk/t/Makefile.in +++ b/hawk/t/Makefile.in @@ -468,6 +468,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -546,6 +547,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/hawk/tools/Makefile.in b/hawk/tools/Makefile.in index 3bcd9676..e1cf5f52 100644 --- a/hawk/tools/Makefile.in +++ b/hawk/tools/Makefile.in @@ -262,6 +262,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ +MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_VERSION = @MYSQL_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -340,6 +341,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@