From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 Aug 2007 14:43:30 +0000 (+0000)
Subject:  r13953@Kushana:  nickm | 2007-08-08 07:40:46 -0700
X-Git-Tag: tor-0.2.0.5-alpha~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da09efe13d0d4773df067659374a96eedff88442;p=thirdparty%2Ftor.git

 r13953@Kushana:  nickm | 2007-08-08 07:40:46 -0700
 Fix osx compilation.


svn:r11065
---

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