diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-25 23:59:47 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-25 23:59:47 +0000 |
| commit | 8508347b9352735d5ded86826c6b989cbeac9cf7 (patch) | |
| tree | ed82a0828272e082b3fb89d136d01f46c97a66b2 | |
| parent | 0f71ade42f6c8bc5b401b93184b5f4ffd52ce3ce (diff) | |
| download | tor-8508347b9352735d5ded86826c6b989cbeac9cf7.tar.gz tor-8508347b9352735d5ded86826c6b989cbeac9cf7.zip | |
r12984@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.
svn:r10345
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e97915d67d..fd200b559d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -174,13 +174,13 @@ if test -z "$CROSS_COMPILE"; then ]) 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 diff --git a/configure.in b/configure.in index bac5d91db1..5528dc8d78 100644 --- a/configure.in +++ b/configure.in @@ -195,11 +195,14 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [ 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 @@ if test x$enable_gcc_warnings = xyes; then 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 |