fixed a segfault bug in mysql::stmt_init(), raising the version to 0.9.8
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
be43c289b6
commit
d6ac0010d3
@ -274,6 +274,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
|
||||
@ -248,6 +248,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
|
||||
120
configure
vendored
120
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for hawk 0.9.7.
|
||||
# Generated by GNU Autoconf 2.71 for hawk 0.9.8.
|
||||
#
|
||||
# Report bugs to <Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)>.
|
||||
#
|
||||
@ -621,8 +621,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='hawk'
|
||||
PACKAGE_TARNAME='hawk'
|
||||
PACKAGE_VERSION='0.9.7'
|
||||
PACKAGE_STRING='hawk 0.9.7'
|
||||
PACKAGE_VERSION='0.9.8'
|
||||
PACKAGE_STRING='hawk 0.9.8'
|
||||
PACKAGE_BUGREPORT='Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)'
|
||||
PACKAGE_URL='https://code.miflux.net/hyung-hwan/hawk'
|
||||
|
||||
@ -664,6 +664,8 @@ LTLIBOBJS
|
||||
LIBOBJS
|
||||
HAWK_PROJECT_URL
|
||||
HAWK_PROJECT_AUTHOR
|
||||
ENABLE_MOD_MEMC_FALSE
|
||||
ENABLE_MOD_MEMC_TRUE
|
||||
ENABLE_MOD_UCI_FALSE
|
||||
ENABLE_MOD_UCI_TRUE
|
||||
ENABLE_MOD_SED_FALSE
|
||||
@ -692,6 +694,7 @@ PACKAGE_VERSION_PATCH
|
||||
PACKAGE_VERSION_MINOR
|
||||
PACKAGE_VERSION_MAJOR
|
||||
QUADMATH_LIBS
|
||||
MEMCACHED_LIBS
|
||||
HAVE_LIBUCI_FALSE
|
||||
HAVE_LIBUCI_TRUE
|
||||
UCI_LIBS
|
||||
@ -867,6 +870,7 @@ enable_mod_mysql
|
||||
with_mysql
|
||||
enable_mod_sed
|
||||
enable_mod_uci
|
||||
enable_mod_memc
|
||||
enable_pthread_flags
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@ -1431,7 +1435,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures hawk 0.9.7 to adapt to many kinds of systems.
|
||||
\`configure' configures hawk 0.9.8 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1502,7 +1506,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of hawk 0.9.7:";;
|
||||
short | recursive ) echo "Configuration of hawk 0.9.8:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1541,6 +1545,8 @@ Optional Features:
|
||||
auto)
|
||||
--enable-mod-sed enable mod/sed. one of yes, no (default. yes)
|
||||
--enable-mod-uci enable mod/uci. one of auto, yes, no (default. auto)
|
||||
--enable-mod-memc enable mod/memc. one of auto, yes, no (default.
|
||||
auto)
|
||||
--enable-pthread-flags add thread flags to CFLAGS, CXXFLAGS, LIBS(default.
|
||||
yes)
|
||||
|
||||
@ -1641,7 +1647,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
hawk configure 0.9.7
|
||||
hawk configure 0.9.8
|
||||
generated by GNU Autoconf 2.71
|
||||
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
@ -2370,7 +2376,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by hawk $as_me 0.9.7, which was
|
||||
It was created by hawk $as_me 0.9.8, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
@ -3868,7 +3874,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='hawk'
|
||||
VERSION='0.9.7'
|
||||
VERSION='0.9.8'
|
||||
|
||||
|
||||
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
||||
@ -20287,6 +20293,12 @@ then :
|
||||
printf "%s\n" "#define HAVE_UCI_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "libmemcached/memcached.h" "ac_cv_header_libmemcached_memcached_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_libmemcached_memcached_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_LIBMEMCACHED_MEMCACHED_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -22491,6 +22503,53 @@ else
|
||||
fi
|
||||
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for memcached in -lmemcached" >&5
|
||||
printf %s "checking for memcached in -lmemcached... " >&6; }
|
||||
if test ${ac_cv_lib_memcached_memcached+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lmemcached $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char memcached ();
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
return memcached ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_lib_memcached_memcached=yes
|
||||
else $as_nop
|
||||
ac_cv_lib_memcached_memcached=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_memcached_memcached" >&5
|
||||
printf "%s\n" "$ac_cv_lib_memcached_memcached" >&6; }
|
||||
if test "x$ac_cv_lib_memcached_memcached" = xyes
|
||||
then :
|
||||
|
||||
MEMCACHED_LIBS="-lmemcached"
|
||||
|
||||
printf "%s\n" "#define HAVE_MEMCACHED_LIB 1" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
|
||||
printf %s "checking for va_copy... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
@ -26375,6 +26434,42 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-mod-memc was given.
|
||||
if test ${enable_mod_memc+y}
|
||||
then :
|
||||
enableval=$enable_mod_memc; enable_mod_memc_is=$enableval
|
||||
else $as_nop
|
||||
enable_mod_memc_is=auto
|
||||
|
||||
fi
|
||||
|
||||
if test "x${enable_mod_memc_is}" = "xauto"
|
||||
then
|
||||
if test "x${ac_cv_header_libmemcached_memcached_h}" != "xyes"
|
||||
then
|
||||
enable_mod_memc_is="no"
|
||||
elif test "x${ac_cv_lib_memcached_memcached}" != "xyes"
|
||||
then
|
||||
enable_mod_memc_is="no"
|
||||
else
|
||||
enable_mod_memc_is="yes"
|
||||
fi
|
||||
fi
|
||||
if test "x${enable_mod_memc_is}" = "xyes"
|
||||
then
|
||||
|
||||
printf "%s\n" "#define HAWK_ENABLE_MOD_MEMC 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
if test "${enable_mod_memc_is}" = "yes"; then
|
||||
ENABLE_MOD_MEMC_TRUE=
|
||||
ENABLE_MOD_MEMC_FALSE='#'
|
||||
else
|
||||
ENABLE_MOD_MEMC_TRUE='#'
|
||||
ENABLE_MOD_MEMC_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-pthread-flags was given.
|
||||
if test ${enable_pthread_flags+y}
|
||||
@ -26602,6 +26697,10 @@ if test -z "${ENABLE_MOD_UCI_TRUE}" && test -z "${ENABLE_MOD_UCI_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_MOD_UCI\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${ENABLE_MOD_MEMC_TRUE}" && test -z "${ENABLE_MOD_MEMC_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_MOD_MEMC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
|
||||
: "${CONFIG_STATUS=./config.status}"
|
||||
ac_write_fail=0
|
||||
@ -26992,7 +27091,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by hawk $as_me 0.9.7, which was
|
||||
This file was extended by hawk $as_me 0.9.8, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -27061,7 +27160,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config='$ac_cs_config_escaped'
|
||||
ac_cs_version="\\
|
||||
hawk config.status 0.9.7
|
||||
hawk config.status 0.9.8
|
||||
configured by $0, generated by GNU Autoconf 2.71,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
@ -29045,6 +29144,7 @@ echo " Math library: ${LIBM}"
|
||||
echo " Socket library: ${SOCKET_LIBS}"
|
||||
echo " Native function call library: ${FFI_LIBS}"
|
||||
echo " Thraed library: ${PTHREAD_LIBS}"
|
||||
echo " Memcached library: ${MEMCACHED_LIBS}"
|
||||
echo "-------------------------------------------------------------------------"
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
dnl AC_PREREQ([2.71])
|
||||
|
||||
AC_INIT([hawk],[0.9.7],[Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)],[],[https://code.miflux.net/hyung-hwan/hawk])
|
||||
AC_INIT([hawk],[0.9.8],[Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)],[],[https://code.miflux.net/hyung-hwan/hawk])
|
||||
|
||||
AC_CONFIG_HEADERS([lib/hawk-cfg.h])
|
||||
AC_CONFIG_AUX_DIR([ac])
|
||||
|
||||
@ -110,10 +110,11 @@ host_triplet = @host@
|
||||
@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_12 = ../mod/libhawk-mysql.la
|
||||
@ENABLE_MOD_SED_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_13 = ../mod/libhawk-sed.la
|
||||
@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_14 = ../mod/libhawk-uci.la
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_15 = ../mod/libhawk-memc.la
|
||||
|
||||
#pkglibdir = $(libdir)
|
||||
#pkglib_LTLIBRARIES =
|
||||
@ENABLE_STATIC_MODULE_FALSE@am__append_15 = libhawk-hawk.la \
|
||||
@ENABLE_STATIC_MODULE_FALSE@am__append_16 = libhawk-hawk.la \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ libhawk-math.la libhawk-str.la \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ libhawk-sys.la
|
||||
subdir = lib
|
||||
@ -227,7 +228,8 @@ libhawk_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
||||
libhawk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
|
||||
$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) $(am__append_11) \
|
||||
$(am__append_12) $(am__append_13) $(am__append_14)
|
||||
$(am__append_12) $(am__append_13) $(am__append_14) \
|
||||
$(am__append_15)
|
||||
am__libhawk_la_SOURCES_DIST = hawk.h hawk-arr.h hawk-chr.h hawk-cli.h \
|
||||
hawk-cmn.h hawk-dir.h hawk-ecs.h hawk-fio.h hawk-fmt.h \
|
||||
hawk-gem.h hawk-glob.h hawk-htb.h hawk-map.h hawk-mtx.h \
|
||||
@ -491,6 +493,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
@ -626,7 +629,7 @@ pkginclude_HEADERS = hawk.h hawk-arr.h hawk-chr.h hawk-cli.h \
|
||||
hawk-rbt.h hawk-pac1.h hawk-pio.h hawk-skad.h hawk-utl.h \
|
||||
hawk-sed.h hawk-sio.h hawk-std.h hawk-str.h hawk-tio.h \
|
||||
hawk-tre.h hawk-upac.h hawk-xma.h $(am__append_7)
|
||||
pkglib_LTLIBRARIES = libhawk.la $(am__append_15)
|
||||
pkglib_LTLIBRARIES = libhawk.la $(am__append_16)
|
||||
libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \
|
||||
ecs.c err-prv.h err.c err-sys.c fmt-imp.h fmt.c fnc-prv.h \
|
||||
fnc.c htb.c gem.c gem-glob.c gem-nwif.c gem-nwif2.c hawk-prv.h \
|
||||
@ -649,7 +652,7 @@ libhawk_la_LDFLAGS = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 ## -no-undefined
|
||||
libhawk_la_LIBADD = $(LIBM) $(SOCKET_LIBS) $(am__append_4) \
|
||||
$(am__append_5) $(am__append_6) $(am__append_10) \
|
||||
$(am__append_11) $(am__append_12) $(am__append_13) \
|
||||
$(am__append_14)
|
||||
$(am__append_14) $(am__append_15)
|
||||
@ENABLE_CXX_FALSE@libhawk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
@ENABLE_CXX_FALSE@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) \
|
||||
@ENABLE_CXX_FALSE@ $(CFLAGS) $(libhawk_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@ -244,6 +244,9 @@
|
||||
/* labels as values */
|
||||
#undef HAVE_LABELS_AS_VALUES
|
||||
|
||||
/* Define to 1 if you have the <libmemcached/memcached.h> header file. */
|
||||
#undef HAVE_LIBMEMCACHED_MEMCACHED_H
|
||||
|
||||
/* Define to 1 if you have the <libunwind.h> header file. */
|
||||
#undef HAVE_LIBUNWIND_H
|
||||
|
||||
@ -298,6 +301,9 @@
|
||||
/* Define to 1 if you have the `makecontext' function. */
|
||||
#undef HAVE_MAKECONTEXT
|
||||
|
||||
/* libmemcached library is available */
|
||||
#undef HAVE_MEMCACHED_LIB
|
||||
|
||||
/* Define to 1 if you have the `mmap' function. */
|
||||
#undef HAVE_MMAP
|
||||
|
||||
@ -705,6 +711,9 @@
|
||||
/* build mod/ffi */
|
||||
#undef HAWK_ENABLE_MOD_FFI
|
||||
|
||||
/* build mod/memc */
|
||||
#undef HAWK_ENABLE_MOD_MEMC
|
||||
|
||||
/* build mod/mysql */
|
||||
#undef HAWK_ENABLE_MOD_MYSQL
|
||||
|
||||
|
||||
@ -92,10 +92,12 @@ host_triplet = @host@
|
||||
@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_2 = libhawk-mysql.la
|
||||
@ENABLE_MOD_SED_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_3 = libhawk-sed.la
|
||||
@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_4 = libhawk-uci.la
|
||||
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_5 = libhawk-ffi.la
|
||||
@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_6 = libhawk-mysql.la
|
||||
@ENABLE_MOD_SED_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_7 = libhawk-sed.la
|
||||
@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_8 = libhawk-uci.la
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_5 = libhawk-memc.la
|
||||
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_6 = libhawk-ffi.la
|
||||
@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_7 = libhawk-mysql.la
|
||||
@ENABLE_MOD_SED_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_8 = libhawk-sed.la
|
||||
@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_9 = libhawk-uci.la
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_10 = libhawk-memc.la
|
||||
subdir = mod
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
|
||||
@ -163,6 +165,21 @@ libhawk_ffi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
||||
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@ -rpath \
|
||||
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir)
|
||||
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libhawk_ffi_la_rpath =
|
||||
@ENABLE_MOD_MEMC_TRUE@libhawk_memc_la_DEPENDENCIES = \
|
||||
@ENABLE_MOD_MEMC_TRUE@ $(am__DEPENDENCIES_1) \
|
||||
@ENABLE_MOD_MEMC_TRUE@ $(am__DEPENDENCIES_1)
|
||||
am__libhawk_memc_la_SOURCES_DIST = mod-memc.c mod-memc.h
|
||||
@ENABLE_MOD_MEMC_TRUE@am_libhawk_memc_la_OBJECTS = \
|
||||
@ENABLE_MOD_MEMC_TRUE@ libhawk_memc_la-mod-memc.lo
|
||||
libhawk_memc_la_OBJECTS = $(am_libhawk_memc_la_OBJECTS)
|
||||
libhawk_memc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
||||
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||
$(libhawk_memc_la_CFLAGS) $(CFLAGS) $(libhawk_memc_la_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libhawk_memc_la_rpath = \
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_FALSE@ -rpath \
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir)
|
||||
@ENABLE_MOD_MEMC_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libhawk_memc_la_rpath =
|
||||
@ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_DEPENDENCIES = \
|
||||
@ENABLE_MOD_MYSQL_TRUE@ $(am__DEPENDENCIES_1) \
|
||||
@ENABLE_MOD_MYSQL_TRUE@ $(am__DEPENDENCIES_1)
|
||||
@ -223,6 +240,7 @@ DEFAULT_INCLUDES =
|
||||
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
|
||||
am__maybe_remake_depfiles = depfiles
|
||||
am__depfiles_remade = ./$(DEPDIR)/libhawk_ffi_la-mod-ffi.Plo \
|
||||
./$(DEPDIR)/libhawk_memc_la-mod-memc.Plo \
|
||||
./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo \
|
||||
./$(DEPDIR)/libhawk_sed_la-mod-sed.Plo \
|
||||
./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo
|
||||
@ -245,9 +263,11 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
|
||||
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
am__v_CCLD_1 =
|
||||
SOURCES = $(libhawk_ffi_la_SOURCES) $(libhawk_mysql_la_SOURCES) \
|
||||
$(libhawk_sed_la_SOURCES) $(libhawk_uci_la_SOURCES)
|
||||
SOURCES = $(libhawk_ffi_la_SOURCES) $(libhawk_memc_la_SOURCES) \
|
||||
$(libhawk_mysql_la_SOURCES) $(libhawk_sed_la_SOURCES) \
|
||||
$(libhawk_uci_la_SOURCES)
|
||||
DIST_SOURCES = $(am__libhawk_ffi_la_SOURCES_DIST) \
|
||||
$(am__libhawk_memc_la_SOURCES_DIST) \
|
||||
$(am__libhawk_mysql_la_SOURCES_DIST) \
|
||||
$(am__libhawk_sed_la_SOURCES_DIST) \
|
||||
$(am__libhawk_uci_la_SOURCES_DIST)
|
||||
@ -335,6 +355,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
@ -457,11 +478,11 @@ CFLAGS_COMMON =
|
||||
@ENABLE_STATIC_MODULE_TRUE@LIBADD_COMMON =
|
||||
@ENABLE_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = $(am__append_1) \
|
||||
@ENABLE_STATIC_MODULE_TRUE@ $(am__append_2) $(am__append_3) \
|
||||
@ENABLE_STATIC_MODULE_TRUE@ $(am__append_4)
|
||||
@ENABLE_STATIC_MODULE_TRUE@ $(am__append_4) $(am__append_5)
|
||||
@ENABLE_STATIC_MODULE_FALSE@pkgmodexecdir = $(libdir)
|
||||
@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = $(am__append_5) \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_6) $(am__append_7) \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_8)
|
||||
@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = $(am__append_6) \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_7) $(am__append_8) \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_9) $(am__append_10)
|
||||
|
||||
##################################################
|
||||
##################################################
|
||||
@ -489,6 +510,11 @@ CFLAGS_COMMON =
|
||||
@ENABLE_MOD_UCI_TRUE@libhawk_uci_la_CFLAGS = $(CFLAGS_COMMON)
|
||||
@ENABLE_MOD_UCI_TRUE@libhawk_uci_la_LDFLAGS = $(LDFLAGS_COMMON)
|
||||
@ENABLE_MOD_UCI_TRUE@libhawk_uci_la_LIBADD = $(LIBADD_COMMON) $(UCI_LIBS)
|
||||
@ENABLE_MOD_MEMC_TRUE@libhawk_memc_la_SOURCES = mod-memc.c mod-memc.h
|
||||
@ENABLE_MOD_MEMC_TRUE@libhawk_memc_la_CPPFLAGS = $(CPPFLAGS_COMMON) $(MEMCACHED_CFLAGS)
|
||||
@ENABLE_MOD_MEMC_TRUE@libhawk_memc_la_CFLAGS = $(CFLAGS_COMMON)
|
||||
@ENABLE_MOD_MEMC_TRUE@libhawk_memc_la_LDFLAGS = $(LDFLAGS_COMMON) $(MEMCACHED_LDFLAGS)
|
||||
@ENABLE_MOD_MEMC_TRUE@libhawk_memc_la_LIBADD = $(LIBADD_COMMON) $(MEMCACHED_LIBS)
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -572,6 +598,9 @@ clean-pkgmodexecLTLIBRARIES:
|
||||
libhawk-ffi.la: $(libhawk_ffi_la_OBJECTS) $(libhawk_ffi_la_DEPENDENCIES) $(EXTRA_libhawk_ffi_la_DEPENDENCIES)
|
||||
$(AM_V_CCLD)$(libhawk_ffi_la_LINK) $(am_libhawk_ffi_la_rpath) $(libhawk_ffi_la_OBJECTS) $(libhawk_ffi_la_LIBADD) $(LIBS)
|
||||
|
||||
libhawk-memc.la: $(libhawk_memc_la_OBJECTS) $(libhawk_memc_la_DEPENDENCIES) $(EXTRA_libhawk_memc_la_DEPENDENCIES)
|
||||
$(AM_V_CCLD)$(libhawk_memc_la_LINK) $(am_libhawk_memc_la_rpath) $(libhawk_memc_la_OBJECTS) $(libhawk_memc_la_LIBADD) $(LIBS)
|
||||
|
||||
libhawk-mysql.la: $(libhawk_mysql_la_OBJECTS) $(libhawk_mysql_la_DEPENDENCIES) $(EXTRA_libhawk_mysql_la_DEPENDENCIES)
|
||||
$(AM_V_CCLD)$(libhawk_mysql_la_LINK) $(am_libhawk_mysql_la_rpath) $(libhawk_mysql_la_OBJECTS) $(libhawk_mysql_la_LIBADD) $(LIBS)
|
||||
|
||||
@ -588,6 +617,7 @@ distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_ffi_la-mod-ffi.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_memc_la-mod-memc.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_sed_la-mod-sed.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo@am__quote@ # am--include-marker
|
||||
@ -629,6 +659,13 @@ libhawk_ffi_la-mod-ffi.lo: mod-ffi.c
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_ffi_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_ffi_la_CFLAGS) $(CFLAGS) -c -o libhawk_ffi_la-mod-ffi.lo `test -f 'mod-ffi.c' || echo '$(srcdir)/'`mod-ffi.c
|
||||
|
||||
libhawk_memc_la-mod-memc.lo: mod-memc.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_memc_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_memc_la_CFLAGS) $(CFLAGS) -MT libhawk_memc_la-mod-memc.lo -MD -MP -MF $(DEPDIR)/libhawk_memc_la-mod-memc.Tpo -c -o libhawk_memc_la-mod-memc.lo `test -f 'mod-memc.c' || echo '$(srcdir)/'`mod-memc.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_memc_la-mod-memc.Tpo $(DEPDIR)/libhawk_memc_la-mod-memc.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mod-memc.c' object='libhawk_memc_la-mod-memc.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_memc_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_memc_la_CFLAGS) $(CFLAGS) -c -o libhawk_memc_la-mod-memc.lo `test -f 'mod-memc.c' || echo '$(srcdir)/'`mod-memc.c
|
||||
|
||||
libhawk_mysql_la-mod-mysql.lo: mod-mysql.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_mysql_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_mysql_la_CFLAGS) $(CFLAGS) -MT libhawk_mysql_la-mod-mysql.lo -MD -MP -MF $(DEPDIR)/libhawk_mysql_la-mod-mysql.Tpo -c -o libhawk_mysql_la-mod-mysql.lo `test -f 'mod-mysql.c' || echo '$(srcdir)/'`mod-mysql.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_mysql_la-mod-mysql.Tpo $(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo
|
||||
@ -784,6 +821,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -f ./$(DEPDIR)/libhawk_ffi_la-mod-ffi.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_memc_la-mod-memc.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_sed_la-mod-sed.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo
|
||||
@ -833,6 +871,7 @@ installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -f ./$(DEPDIR)/libhawk_ffi_la-mod-ffi.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_memc_la-mod-memc.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_sed_la-mod-sed.Plo
|
||||
-rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo
|
||||
|
||||
@ -337,7 +337,7 @@ BEGIN {
|
||||
while (mysql::fetch_row(result, row) > 0)
|
||||
{
|
||||
ncols = length(row);
|
||||
for (i = 0; i < ncols; i++) print row[i];
|
||||
for (i = 1; i <= ncols; i++) print row[i];
|
||||
print "----";
|
||||
}
|
||||
|
||||
@ -1173,6 +1173,7 @@ done:
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------------------------- */
|
||||
|
||||
static int fnc_stmt_init (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi)
|
||||
{
|
||||
sql_list_t* sql_list;
|
||||
@ -1183,7 +1184,7 @@ static int fnc_stmt_init (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi)
|
||||
|
||||
sql_list = rtx_to_sql_list(rtx, fi);
|
||||
sql_node = get_sql_list_node_with_arg(rtx, sql_list, hawk_rtx_getarg(rtx, 0));
|
||||
if (sql_list)
|
||||
if (sql_node)
|
||||
{
|
||||
stmt_list_t* stmt_list;
|
||||
stmt_node_t* stmt_node;
|
||||
|
||||
@ -279,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
|
||||
@ -477,6 +477,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
|
||||
@ -247,6 +247,7 @@ LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MEMCACHED_LIBS = @MEMCACHED_LIBS@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
MYSQL_CFLAGS = @MYSQL_CFLAGS@
|
||||
MYSQL_CONFIG = @MYSQL_CONFIG@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user