diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-04-02 19:02:47 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-04-02 19:02:47 -0600 |
| commit | 8f69346e54cf7a382eeb9c4be08393ae91ab779b (patch) | |
| tree | 656495e9437918db379db60650ac2ebe1c239247 /strings | |
| parent | c14572b3bb3d90ca753d7e076101a82a262ae747 (diff) | |
| parent | a206f1075ff6d954a8bd9f66f5dce5c59f7ae830 (diff) | |
| download | mariadb-git-8f69346e54cf7a382eeb9c4be08393ae91ab779b.tar.gz | |
Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-fast
configure.in:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index 658ea8a2a6d..6bf21d630f3 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -39,7 +39,6 @@ endif endif libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS) - noinst_PROGRAMS = conf_to_src # Default charset definitions EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \ @@ -71,6 +70,9 @@ ctype_extra_sources.c: conf_to_src $(srcdir)/ctype_extra_sources.c conf_to_src_SOURCES = conf_to_src.c conf_to_src_LDADD= +#force static linking of conf_to_src - essential when linking against +#custom installation of libc +conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ # This is because the dependency tracking misses @FOO@ vars in sources. strtoull.o: @CHARSET_OBJS@ |