| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 6515f3e7656d97d40a6a1cf4eb3ada193a698309 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 12 Sep 2018 23:18:12 +0800 |
| 4 | Subject: [PATCH] Allow saslauthd to be built outside of source tree while |
| 5 | configuring with `--enable-ldapdb' |
| 6 | |
| 7 | [snip] |
| 8 | | powerpc-wrs-linux-gcc [snip] -I../common |
| 9 | |../../git/saslauthd/lak.c:58:10: fatal error: crypto-compat.h: |
| 10 | No such file or directory |
| 11 | [snip] |
| 12 | |
| 13 | The crypto-compat.h locates in git/common/, it should be | |
| 14 | `-I../../git/common' |
| 15 | |
| 16 | Remove useless `-I$(top_srcdir)/../include' which was incorrectly |
| 17 | added by commit `faae590 cleanup misc INCLUDES for different build paths' |
| 18 | |
| 19 | Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl] |
| 20 | |
| 21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 22 | --- |
| 23 | saslauthd/Makefile.am | 2 +- |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 25 | |
| 26 | diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am |
| 27 | index d7244be..864b29b 100644 |
| 28 | --- a/saslauthd/Makefile.am |
| 29 | +++ b/saslauthd/Makefile.am |
| 30 | @@ -34,7 +34,7 @@ saslcache_SOURCES = saslcache.c |
| 31 | |
| 32 | EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \ |
| 33 | getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD |
| 34 | -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include -I$(top_builddir)/common |
| 35 | +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/common -I$(top_srcdir)/common |
| 36 | DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. |
| 37 | |
| 38 | |
| 39 | -- |
| 40 | 2.7.4 |
| 41 | |