diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/or/Makefile.am | 2 | ||||
| -rw-r--r-- | src/tools/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 5539c91d37..167c606551 100644 --- a/configure.in +++ b/configure.in @@ -13,6 +13,10 @@ if test -f /etc/redhat-release ; then CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" fi +# Not a no-op; we want to make sure that CPPFLAGS is set before we use +# the += operator on it in src/or/Makefile.am +CPPFLAGS="$CPPFLAGS -I../common" + AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug, compile with debugging info), [if test x$enableval = xyes; then diff --git a/src/or/Makefile.am b/src/or/Makefile.am index fea5fcfea8..5679dc1701 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -1,5 +1,3 @@ -CPPFLAGS += -I../common - TESTS = test noinst_PROGRAMS = test diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 8861ec84af..7d7f2c7b8f 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,5 +1,3 @@ -CPPFLAGS += -I../common - bin_PROGRAMS = tor-resolve tor-gencert tor_resolve_SOURCES = tor-resolve.c |