summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-19 16:43:40 +0200
committerAndy Wingo <wingo@pobox.com>2015-04-19 16:43:40 +0200
commitc0a1dc6fdf69a47fd2fa959ca67790073d7d675d (patch)
tree5d2050d33e3dc7ea2ae5be10942771a290c10b48
parentdba4ec46cb0f53b4a8d0302987e3c127781e1338 (diff)
Remove certificate root checks
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac10
2 files changed, 0 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index eb758195dc..67f57eb661 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,6 @@ AM_CPPFLAGS = \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
- -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
-DROOTPREFIX=\"$(rootprefix)\" \
-DRANDOM_SEED_DIR=\"$(localstatedir)/lib/elogind/\" \
@@ -977,7 +976,6 @@ substitutions = \
'|sysctldir=$(sysctldir)|' \
'|systemgeneratordir=$(systemgeneratordir)|' \
'|usergeneratordir=$(usergeneratordir)|' \
- '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
diff --git a/configure.ac b/configure.ac
index 9639532af2..974a8db431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,15 +372,6 @@ if test "x$enable_apparmor" != "xno"; then
fi
AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"])
-
-AC_ARG_WITH([certificate-root],
- AS_HELP_STRING([--with-certificate-root=PATH],
- [Specify the prefix for TLS certificates [/etc/ssl]]),
- [CERTIFICATEROOT="$withval"],
- [CERTIFICATEROOT="/etc/ssl"])
-
-AC_SUBST(CERTIFICATEROOT)
-
# ------------------------------------------------------------------------------
AC_ARG_ENABLE([pam],
AS_HELP_STRING([--disable-pam],[Disable optional PAM support]),
@@ -702,7 +693,6 @@ AC_MSG_RESULT([
Zsh completions dir: ${with_zshcompletiondir}
Maximum System UID: ${SYSTEM_UID_MAX}
Maximum System GID: ${SYSTEM_GID_MAX}
- Certificate root: ${CERTIFICATEROOT}
CFLAGS: ${OUR_CFLAGS} ${CFLAGS}
CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}