r13953@Kushana: nickm | 2007-08-08 07:40:46 -0700

 Fix osx compilation.

svn:r11065

diff --git a/configure.in b/configure.in
index 5539c91d37c1df82630aec25fee4b8b32edc6050..167c606551f177ad4491cb0a7f544dd29226a18f 100644 (file)
--- 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 fea5fcfea8a4fa440614fd761b1c5c509b6ed40b..5679dc17017b140750eb5dead61afbc3f05bfd09 100644 (file)
--- 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 8861ec84afa1de85963e79a14e53c6649beaccb0..7d7f2c7b8f81a5fe826f56b72cfb00b4cd7a098b 100644 (file)
--- 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