hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switched ax_lib_mysql.m4 to ax_lib_mariadb.m4 and made it mariadb specific

Browse Source
This commit is contained in:
hyung-hwan
2020-11-04 07:46:07 +00:00
parent debe2f8939
commit 088ea05e7b
11 changed files with 301 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mio/lib/Makefile.am
View File

@ -95,9 +95,9 @@ libmio_la_LIBADD = $(LIBADD_LIB_COMMON) $(SSL_LIBS) $(SOCKET_LIBS) $(SENDFILE_LI
if ENABLE_MARIADB
include_HEADERS += mio-mar.h
libmio_la_SOURCES += mar.c mar-cli.c
libmio_la_CFLAGS += $(MYSQL_CFLAGS)
libmio_la_LDFLAGS += $(MYSQL_LDFLAGS)
libmio_la_LIBADD += $(MYSQL_LIBS)
libmio_la_CFLAGS += $(MARIADB_CFLAGS)
libmio_la_LDFLAGS += $(MARIADB_LDFLAGS)
libmio_la_LIBADD += $(MARIADB_LIBS)
endif
if ENABLE_SSL

26
mio/lib/Makefile.in
View File

@ -91,18 +91,18 @@ build_triplet = @build@
host_triplet = @host@
@ENABLE_MARIADB_TRUE@am__append_1 = mio-mar.h
@ENABLE_MARIADB_TRUE@am__append_2 = mar.c mar-cli.c
@ENABLE_MARIADB_TRUE@am__append_3 = $(MYSQL_CFLAGS)
@ENABLE_MARIADB_TRUE@am__append_4 = $(MYSQL_LDFLAGS)
@ENABLE_MARIADB_TRUE@am__append_5 = $(MYSQL_LIBS)
@ENABLE_MARIADB_TRUE@am__append_3 = $(MARIADB_CFLAGS)
@ENABLE_MARIADB_TRUE@am__append_4 = $(MARIADB_LDFLAGS)
@ENABLE_MARIADB_TRUE@am__append_5 = $(MARIADB_LIBS)
@ENABLE_SSL_TRUE@am__append_6 = $(SSL_LIBS)
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
$(top_srcdir)/m4/ax_lib_mysql.m4 $(top_srcdir)/m4/ax_numval.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/ax_lib_mariadb.m4 \
$(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__include_HEADERS_DIST) \
@ -318,14 +318,14 @@ LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MARIADB_CFLAGS = @MARIADB_CFLAGS@
MARIADB_CONFIG = @MARIADB_CONFIG@
MARIADB_LDFLAGS = @MARIADB_LDFLAGS@
MARIADB_LIBS = @MARIADB_LIBS@
MARIADB_VERSION = @MARIADB_VERSION@
MIO_PROJECT_AUTHOR = @MIO_PROJECT_AUTHOR@
MIO_PROJECT_URL = @MIO_PROJECT_URL@
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@
OBJDUMP = @OBJDUMP@

6
mio/lib/mio-cfg.h.in
View File

@ -322,6 +322,9 @@
/* Define to 1 if you have the `makecontext' function. */
#undef HAVE_MAKECONTEXT
/* Define to 1 if MariaDB libraries are available */
#undef HAVE_MARIADB
/* Define to 1 if you have the `mbrlen' function. */
#undef HAVE_MBRLEN
@ -343,9 +346,6 @@
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
/* Define to 1 if MySQL libraries are available */
#undef HAVE_MYSQL
/* Define to 1 if you have the `nanosleep' function. */
#undef HAVE_NANOSLEEP