summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorunknown <tim@black.box>2001-09-16 21:41:22 -0400
committerunknown <tim@black.box>2001-09-16 21:41:22 -0400
commit5fffbb123615ad0b256652390467b33ed2919afc (patch)
tree7ff6a4243043fa71bd04fa3434bd8e13992df771 /acinclude.m4
parent34925f8d823c700c939f0622b6af85001458a226 (diff)
downloadmariadb-git-5fffbb123615ad0b256652390467b33ed2919afc.tar.gz
Add some examples for using libmysqld, including a hack for running the
mysql test suite. A few minor libmysqld fixes. Add mysql_server_init() and _end() to mysql.cc and mysqltest.c, so they can be linked against libmysqlclient or libmysqld. sql/mysqld.cc: have unireg_end() exit(), instead of pthread_exit() if inside the EMBEDDED_LIBRARY. This is a hack which hopefully won't be needed. But without it, the program hangs at end. client/mysql.cc: Don't call mysql_ssl_clear() unless HAVE_OPENSSL. client/mysqltest.c: Add mysql_server_init() and _end(). acinclude.m4: change .. to $(top_builddir) in innodb_libs Makefile.am: Add libmysqld/examples to link_sources target configure.in: output libmysqld/examples/Makefile Also, change .. to $(top_builddir) in readline_link BitKeeper/etc/ignore: added linked_libmysqldex_sources mysql-test/mysql-test-run.sh: use latin1, not latin1_de, in tests libmysqld/libmysqld.c: Add replication functions.
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m472
1 files changed, 36 insertions, 36 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 82490f0e988..3ee6be6b894 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1071,42 +1071,42 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
dnl Some libs are listed several times, in order for gcc to sort out
dnl circular references.
innodb_libs="\
- ../innobase/usr/libusr.a\
- ../innobase/odbc/libodbc.a\
- ../innobase/srv/libsrv.a\
- ../innobase/que/libque.a\
- ../innobase/srv/libsrv.a\
- ../innobase/dict/libdict.a\
- ../innobase/ibuf/libibuf.a\
- ../innobase/row/librow.a\
- ../innobase/pars/libpars.a\
- ../innobase/btr/libbtr.a\
- ../innobase/trx/libtrx.a\
- ../innobase/read/libread.a\
- ../innobase/usr/libusr.a\
- ../innobase/buf/libbuf.a\
- ../innobase/ibuf/libibuf.a\
- ../innobase/eval/libeval.a\
- ../innobase/log/liblog.a\
- ../innobase/fsp/libfsp.a\
- ../innobase/fut/libfut.a\
- ../innobase/fil/libfil.a\
- ../innobase/lock/liblock.a\
- ../innobase/mtr/libmtr.a\
- ../innobase/page/libpage.a\
- ../innobase/rem/librem.a\
- ../innobase/thr/libthr.a\
- ../innobase/com/libcom.a\
- ../innobase/sync/libsync.a\
- ../innobase/data/libdata.a\
- ../innobase/mach/libmach.a\
- ../innobase/ha/libha.a\
- ../innobase/dyn/libdyn.a\
- ../innobase/mem/libmem.a\
- ../innobase/sync/libsync.a\
- ../innobase/ut/libut.a\
- ../innobase/os/libos.a\
- ../innobase/ut/libut.a"
+ $(top_builddir)/innobase/usr/libusr.a\
+ $(top_builddir)/innobase/odbc/libodbc.a\
+ $(top_builddir)/innobase/srv/libsrv.a\
+ $(top_builddir)/innobase/que/libque.a\
+ $(top_builddir)/innobase/srv/libsrv.a\
+ $(top_builddir)/innobase/dict/libdict.a\
+ $(top_builddir)/innobase/ibuf/libibuf.a\
+ $(top_builddir)/innobase/row/librow.a\
+ $(top_builddir)/innobase/pars/libpars.a\
+ $(top_builddir)/innobase/btr/libbtr.a\
+ $(top_builddir)/innobase/trx/libtrx.a\
+ $(top_builddir)/innobase/read/libread.a\
+ $(top_builddir)/innobase/usr/libusr.a\
+ $(top_builddir)/innobase/buf/libbuf.a\
+ $(top_builddir)/innobase/ibuf/libibuf.a\
+ $(top_builddir)/innobase/eval/libeval.a\
+ $(top_builddir)/innobase/log/liblog.a\
+ $(top_builddir)/innobase/fsp/libfsp.a\
+ $(top_builddir)/innobase/fut/libfut.a\
+ $(top_builddir)/innobase/fil/libfil.a\
+ $(top_builddir)/innobase/lock/liblock.a\
+ $(top_builddir)/innobase/mtr/libmtr.a\
+ $(top_builddir)/innobase/page/libpage.a\
+ $(top_builddir)/innobase/rem/librem.a\
+ $(top_builddir)/innobase/thr/libthr.a\
+ $(top_builddir)/innobase/com/libcom.a\
+ $(top_builddir)/innobase/sync/libsync.a\
+ $(top_builddir)/innobase/data/libdata.a\
+ $(top_builddir)/innobase/mach/libmach.a\
+ $(top_builddir)/innobase/ha/libha.a\
+ $(top_builddir)/innobase/dyn/libdyn.a\
+ $(top_builddir)/innobase/mem/libmem.a\
+ $(top_builddir)/innobase/sync/libsync.a\
+ $(top_builddir)/innobase/ut/libut.a\
+ $(top_builddir)/innobase/os/libos.a\
+ $(top_builddir)/innobase/ut/libut.a"
AC_CHECK_LIB(rt, aio_read, [innodb_libs="$innodb_libs -lrt"])
;;