summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-20 09:25:50 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-20 09:27:04 -0400
commit257b28077676f6d8a3c0d2beef37a9414c747de9 (patch)
tree695c91b2cfe3cf0748f1221f2f3846b3d5cd1304 /configure.ac
parent178b738be0e1cb7a20dbb8b0d01eadc0cf6db0ba (diff)
downloadtor-257b28077676f6d8a3c0d2beef37a9414c747de9.tar.gz
tor-257b28077676f6d8a3c0d2beef37a9414c747de9.zip
Simplify AM_CPPFLAGS include setup
We had accumulated a bunch of cruft here. Now let's only include src and src/ext. (exception: src/trunnel is autogenerated code, and need to include src/trunnel.) This commit will break the build hard. The next commit will fix it.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac10
1 files changed, 0 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index ebdda284f5..8a0d135c53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,16 +21,6 @@ AC_CANONICAL_HOST
PKG_PROG_PKG_CONFIG
-if test -f "/etc/redhat-release"; then
- if test -f "/usr/kerberos/include"; then
- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
- fi
-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\${top_srcdir}/src/common"
-
AC_ARG_ENABLE(openbsd-malloc,
AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only]))
AC_ARG_ENABLE(static-openssl,