diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
| commit | 92f698f9f0eeac0d95442248e1581370493201b5 (patch) | |
| tree | 1376a3d4a74cd08e15f83cede09c69c5ec9fec94 /configure.in | |
| parent | 268eb66421971a5eb4581abe3c51ca4b8f4fd385 (diff) | |
| parent | 2533dd084403235c5f36590a1b8106761ff989b7 (diff) | |
| download | mariadb-git-92f698f9f0eeac0d95442248e1581370493201b5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
config/ac-macros/yassl.m4:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Manual merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 40ff480bb94..2179c82e2e5 100644 --- a/configure.in +++ b/configure.in @@ -1129,7 +1129,7 @@ dnl Is this the right match for DEC OSF on alpha? sql/Makefile.in) # Use gen_lex_hash.linux instead of gen_lex_hash # Add library dependencies to mysqld_DEPENDENCIES - lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)" + lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs) \$(yassl_libs)" cat > $filesed << EOF s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1, s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux, |