From f53adf752c4addfed2b082da31718ac4ce218b12 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 9 Sep 2010 23:59:56 +0200
Subject: [PATCH] Removed --enable-header-install setting.
---
Makefile.am | 6 ++----
configure.in | 10 ----------
src/lib-sieve/Makefile.am | 8 ++------
src/lib-sieve/plugins/enotify/Makefile.am | 10 +++-------
src/lib-sieve/plugins/environment/Makefile.am | 10 +++-------
src/lib-sieve/plugins/variables/Makefile.am | 10 +++-------
6 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8027c8fb2..6a6ac6297 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,8 @@ EXTRA_DIST = \
COPYING.LGPL \
ChangeLog
-if INSTALL_HEADERS
- pkginc_libdir=$(dovecot_pkgincludedir)/sieve
- nodist_pkginc_lib_HEADERS = pigeonhole-config.h
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+nodist_pkginc_lib_HEADERS = pigeonhole-config.h
if MAINTAINER_MODE
ChangeLog: .hg/dirstate
diff --git a/configure.in b/configure.in
index 6859b7afd..81eeb5307 100644
--- a/configure.in
+++ b/configure.in
@@ -59,16 +59,6 @@ fi
#
#
-AC_ARG_ENABLE(header-install,
-[ --enable-header-install Install development headers],
- if test x$enableval = xno; then
- want_headers=no
- else
- want_headers=yes
- fi,
- want_headers=no)
-AM_CONDITIONAL(INSTALL_HEADERS, test "$want_headers" = "yes")
-
AC_ARG_WITH(docs,
[ --with-docs Install documentation (default)],
if test x$withval = xno; then
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index 509efffda..5c539082e 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -149,9 +149,5 @@ headers = \
sieve-plugins.h \
sieve.h
-if INSTALL_HEADERS
- pkginc_libdir=$(dovecot_pkgincludedir)/sieve
- pkginc_lib_HEADERS = $(headers)
-else
- noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/enotify/Makefile.am b/src/lib-sieve/plugins/enotify/Makefile.am
index a3fc8acef..22a0cd5bf 100644
--- a/src/lib-sieve/plugins/enotify/Makefile.am
+++ b/src/lib-sieve/plugins/enotify/Makefile.am
@@ -39,10 +39,6 @@ headers = \
ext-enotify-limits.h \
ext-enotify-common.h
-if INSTALL_HEADERS
- pkginc_libdir=$(dovecot_pkgincludedir)/sieve
- pkginc_lib_HEADERS = $(public_headers)
- noinst_HEADERS = $(headers)
-else
- noinst_HEADERS = $(headers) $(public_headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(public_headers)
+noinst_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/environment/Makefile.am b/src/lib-sieve/plugins/environment/Makefile.am
index a19012863..916362ebc 100644
--- a/src/lib-sieve/plugins/environment/Makefile.am
+++ b/src/lib-sieve/plugins/environment/Makefile.am
@@ -18,11 +18,7 @@ public_headers = \
headers = \
ext-environment-common.h
-if INSTALL_HEADERS
- pkginc_libdir=$(dovecot_pkgincludedir)/sieve
- pkginc_lib_HEADERS = $(public_headers)
- noinst_HEADERS = $(headers)
-else
- noinst_HEADERS = $(headers) $(public_headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(public_headers)
+noinst_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/variables/Makefile.am b/src/lib-sieve/plugins/variables/Makefile.am
index bb9e44efd..59fb0142b 100644
--- a/src/lib-sieve/plugins/variables/Makefile.am
+++ b/src/lib-sieve/plugins/variables/Makefile.am
@@ -35,11 +35,7 @@ headers = \
ext-variables-modifiers.h \
ext-variables-dump.h
-if INSTALL_HEADERS
- pkginc_libdir=$(dovecot_pkgincludedir)/sieve
- pkginc_lib_HEADERS = $(public_headers)
- noinst_HEADERS = $(headers)
-else
- noinst_HEADERS = $(headers) $(public_headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(public_headers)
+noinst_HEADERS = $(headers)
--
GitLab