diff options
| author | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
| commit | 41e2af9fa256ff2bf65444850abc09ad5ecaafcb (patch) | |
| tree | 1adb92a14ccbe505c0035f0f41b8f01c288979b0 /vio | |
| parent | 885577b8b8a2fff45ea437dacd56b75498bfc1be (diff) | |
| parent | fc8f14262ad9ff17226cb1bd211fd48f191ec68f (diff) | |
| download | mariadb-git-41e2af9fa256ff2bf65444850abc09ad5ecaafcb.tar.gz | |
Merge
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
tests/Makefile.am:
Auto merged
vio/Makefile.am:
SCCS merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vio/Makefile.am b/vio/Makefile.am index cd4212089c4..0d4f052b30a 100644 --- a/vio/Makefile.am +++ b/vio/Makefile.am @@ -19,7 +19,8 @@ if HAVE_YASSL else yassl_dummy_link_fix= endif -INCLUDES= -I$(top_srcdir)/include $(openssl_includes) +INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ + $(openssl_includes) LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) pkglib_LIBRARIES= libvio.a noinst_PROGRAMS = test-ssl test-sslserver test-sslclient |