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

 Fix osx compilation.


svn:r11065

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

src/or/Makefile.am

@@ -1,5 +1,3 @@
-CPPFLAGS += -I../common
-
 TESTS = test
 
 noinst_PROGRAMS = test

src/tools/Makefile.am

@@ -1,5 +1,3 @@
-CPPFLAGS += -I../common
-
 bin_PROGRAMS = tor-resolve tor-gencert
 
 tor_resolve_SOURCES = tor-resolve.c