[or-cvs] r10345: Do not alter CPPFLAGS until we are actually done with the re (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2007-05-25 19:59:47 -0400 (Fri, 25 May 2007)
New Revision: 10345

Modified:
   tor/trunk/
   tor/trunk/acinclude.m4
   tor/trunk/configure.in
Log:
 r12984 at catbus:  nickm | 2007-05-25 19:59:41 -0400
 Do not alter CPPFLAGS until we are actually done with the rest of configure.in: this way, we notice if there are library paths that we are missing.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12984] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/acinclude.m4
===================================================================
--- tor/trunk/acinclude.m4	2007-05-25 23:23:18 UTC (rev 10344)
+++ tor/trunk/acinclude.m4	2007-05-25 23:59:47 UTC (rev 10345)
@@ -174,13 +174,13 @@
   ]) dnl end cache check check for extra options.
 
   if test "$tor_cv_library_$1_linker_option" != "(none)" ; then
-    TOR_LDFLAGS_$1="$tor_cv_library_$1_linker_option"
+    TOR_LDFLAGS_$1="$TOR_LDFLAGS_$1 $tor_cv_library_$1_linker_option"
   fi
 fi # cross-compile
 
 LIBS="$tor_saved_LIBS"
 LDFLAGS="$tor_saved_LDFLAGS"
-CPPFLAGS="$TOR_CPPFLAGS_$1 $tor_saved_CPPFLAGS"
+CPPFLAGS="$tor_saved_CPPFLAGS"
 
 ]) dnl end defun
 

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-05-25 23:23:18 UTC (rev 10344)
+++ tor/trunk/configure.in	2007-05-25 23:59:47 UTC (rev 10345)
@@ -195,11 +195,14 @@
 dnl Now check for particular libevent functions.
 save_LIBS="$LIBS"
 save_LDFLAGS="$LDFLAGS"
+save_CPPFLAGS="$CPPFLAGS"
 LIBS="-levent $TOR_LIB_WS32 $LIBS"
 LDFLAGS="$TOR_LDFLAGS_libevent $LIBS"
+CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS"
 AC_CHECK_FUNCS(event_get_version event_get_method event_set_log_callback)
 LIBS="$save_LIBS"
 LDFLAGS="$save_LDFLAGS"
+CPPFLAGS="$save_CPPFLAGS"
 
 dnl ------------------------------------------------------
 dnl Where do you live, openssl?  And how do we call you?
@@ -639,6 +642,8 @@
 
 fi
 
+CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
+
 AC_CONFIG_FILES([Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
 AC_OUTPUT