diff options
| author | Vladislav Vaintroub <wlad@sol> | 2009-12-04 20:05:04 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sol> | 2009-12-04 20:05:04 +0000 |
| commit | a426f50f5c77086f50d1853f48159c391bcd633f (patch) | |
| tree | 88f8eb36158b237cddb8fd5b1c7ee5283f8124f6 /libmysql | |
| parent | 131d1e6fdd88090dde6144be3c3d5150449efb95 (diff) | |
| parent | 560e76c567c3551f5a4320acfc954200e8330ad8 (diff) | |
| download | mariadb-git-a426f50f5c77086f50d1853f48159c391bcd633f.tar.gz | |
merge
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 6 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index f67abfd8ac6..681b6fad1ff 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2004 MySQL AB +# Copyright (C) 2000-2004 MySQL AB, 2008-2009 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 GNU General Public License as @@ -21,7 +21,9 @@ # This file is public domain and comes with NO WARRANTY of any kind target = libmysqlclient.la -target_defs = -DMYSQL_CLIENT_NO_THREADS -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ +target_defs = -DMYSQL_CLIENT_NO_THREADS -DDONT_USE_RAID \ + -DDISABLE_MYSQL_THREAD_H @LIB_EXTRA_CCFLAGS@ + LIBS = @CLIENT_LIBS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index acc709bfb89..b626d3343ce 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2004 MySQL AB +# Copyright (C) 2000-2004 MySQL AB, 2008-2009 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 GNU General Public License as @@ -68,7 +68,8 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_iocache2.lo my_seek.lo my_sleep.lo \ my_pread.lo mf_cache.lo md5.lo sha1.lo \ my_getopt.lo my_gethostbyname.lo my_port.lo \ - my_rename.lo my_chsize.lo my_sync.lo my_getsystime.lo + my_rename.lo my_chsize.lo my_sync.lo \ + my_getsystime.lo my_symlink2.lo mf_same.lo sqlobjects = net.lo sql_cmn_objects = pack.lo client.lo my_time.lo |