[or-cvs] r18809: {tor} Build correctly from outside main source tree. Patch from Mi (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2009-03-08 19:18:44 -0400 (Sun, 08 Mar 2009)
New Revision: 18809

Modified:
   tor/trunk/ChangeLog
   tor/trunk/configure.in
Log:
Build correctly from outside main source tree. Patch from Michael Gold.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-03-08 10:38:54 UTC (rev 18808)
+++ tor/trunk/ChangeLog	2009-03-08 23:18:44 UTC (rev 18809)
@@ -41,6 +41,8 @@
       aligned.  Possible fix for bug 604.
     - Parse dates and IPv4 addresses in a locale- and libc-independent
       manner, to avoid platform-dependent behavior on malformed input.
+    - Build correctly when configured to build outside the main source
+      path.  Patch from Michael Gold.
 
   o Minor features:
     - On Linux, use the prctl call to re-enable core dumps when the user
@@ -50,7 +52,6 @@
       can keep up-to-date on which relays they should be using.
     - Update to the "February 26 2009" ip-to-country file.
 
-
 Changes in version 0.2.0.34 - 2009-02-08
   Tor 0.2.0.34 features several more security-related fixes. You should
   upgrade, especially if you run an exit relay (remote crash) or a

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2009-03-08 10:38:54 UTC (rev 18808)
+++ tor/trunk/configure.in	2009-03-08 23:18:44 UTC (rev 18809)
@@ -18,7 +18,7 @@
 
 # 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"
+CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common"
 
 AC_ARG_ENABLE(debug,
  AS_HELP_STRING(--enable-debug, compile with debugging info),