[or-cvs] r11065: Fix osx compilation. (in tor/trunk: . src/or src/tools)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-08-08 10:43:30 -0400 (Wed, 08 Aug 2007)
New Revision: 11065

Modified:
   tor/trunk/
   tor/trunk/configure.in
   tor/trunk/src/or/Makefile.am
   tor/trunk/src/tools/Makefile.am
Log:
 r13953@Kushana:  nickm | 2007-08-08 07:40:46 -0700
 Fix osx compilation.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13953] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-08-08 14:43:25 UTC (rev 11064)
+++ tor/trunk/configure.in	2007-08-08 14:43:30 UTC (rev 11065)
@@ -13,6 +13,10 @@
     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

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-08-08 14:43:25 UTC (rev 11064)
+++ tor/trunk/src/or/Makefile.am	2007-08-08 14:43:30 UTC (rev 11065)
@@ -1,5 +1,3 @@
-CPPFLAGS += -I../common
-
 TESTS = test
 
 noinst_PROGRAMS = test

Modified: tor/trunk/src/tools/Makefile.am
===================================================================
--- tor/trunk/src/tools/Makefile.am	2007-08-08 14:43:25 UTC (rev 11064)
+++ tor/trunk/src/tools/Makefile.am	2007-08-08 14:43:30 UTC (rev 11065)
@@ -1,5 +1,3 @@
-CPPFLAGS += -I../common
-
 bin_PROGRAMS = tor-resolve tor-gencert
 
 tor_resolve_SOURCES = tor-resolve.c