aboutsummaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-05-25 23:59:47 +0000
committerNick Mathewson <nickm@torproject.org>2007-05-25 23:59:47 +0000
commit8508347b9352735d5ded86826c6b989cbeac9cf7 (patch)
treeed82a0828272e082b3fb89d136d01f46c97a66b2 /acinclude.m4
parent0f71ade42f6c8bc5b401b93184b5f4ffd52ce3ce (diff)
downloadtor-8508347b9352735d5ded86826c6b989cbeac9cf7.tar
tor-8508347b9352735d5ded86826c6b989cbeac9cf7.tar.gz
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
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index e97915d67..fd200b559 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