diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-22 16:44:37 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-22 16:44:37 +0100 |
| commit | 16f0c9f606ca2ea27fabf97b85fe3e7a15380892 (patch) | |
| tree | ac14e101c8a457a45f577f647be94c3deb699d52 /extra/Makefile.am | |
| parent | 56dd63a7ac63f8d65dcc023cde1b5b910b474508 (diff) | |
| parent | c36e2c23323fb2d8afe9ac08a08c3fd7ec041886 (diff) | |
| download | mariadb-git-16f0c9f606ca2ea27fabf97b85fe3e7a15380892.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
extra/Makefile.am:
Auto merged
sql/share/errmsg.txt:
Use local errmsg.txt
extra/comp_err.c:
Manual merge
Diffstat (limited to 'extra/Makefile.am')
| -rw-r--r-- | extra/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 1ea0b7ddb38..b2d504cfb62 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -16,7 +16,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/sql LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ - ../dbug/libdbug.a ../strings/libmystrings.a + ../dbug/libdbug.a ../strings/libmystrings.a \ + $(ZLIB_LIBS) BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/sql_state.h \ $(top_builddir)/include/mysqld_ername.h |