configure: Removed --enable-header-install. It's now always enabled.

There didn't seem to be much point in keeping it optional anymore. They're
now more useful than before because shared libraries are also installed.

--HG--
branch : HEAD

diff --git a/Makefile.am b/Makefile.am
index 07d046f58fcf285d288910eac3e96f78af34ef7a..4d6924571e667153dcdada5b3a2f12756bfdbe50 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,12 +23,8 @@ EXTRA_DIST = \
 datafiles = \
        dovecot-config
 
-if INSTALL_HEADERS
-  nodist_pkginclude_HEADERS = config.h
-  pkglib_DATA = $(datafiles)
-else
-  noinst_DATA = $(datafiles)
-endif
+nodist_pkginclude_HEADERS = config.h
+pkglib_DATA = $(datafiles)
 
 if MAINTAINER_MODE
 ChangeLog: .hg/dirstate
@@ -56,7 +52,6 @@ dovecot-config: dovecot-config.in Makefile
        -e "s|^\(dovecot_moduledir\)=|\1=$(moduledir)|" \
        > dovecot-config
 
-if INSTALL_HEADERS
 install-exec-hook:
        rm $(DESTDIR)$(pkglibdir)/dovecot-config && \
        grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
@@ -67,9 +62,6 @@ install-exec-hook:
        -e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1=-ldovecot-storage|" \
        -e "s|^\(LIBDOVECOT_INCLUDE\)=.*$$|\1=-I$(pkgincludedir)|" \
        > $(DESTDIR)$(pkglibdir)/dovecot-config
-else
-install-exec-hook:
-endif
 
 CLEANFILES = $(datafiles)
 

diff --git a/configure.in b/configure.in
index 847f2f90977347dcb89a5a0ddf0b1f187425a4ed..0067fc68a6cfc54dce7ae8a4757adb84ceeb9feb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -254,16 +254,6 @@ AC_ARG_WITH(docs,
        want_docs=yes)
 AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes")
 
-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")
-
 dnl always enable all of the passbs and userdbs that don't require extra libs
 want_passwd=yes
 want_passwd_file=yes
@@ -2016,7 +2006,9 @@ if test $want_ldap != no; then
                                AC_DEFINE(LDAP_HAVE_START_TLS_S,, Define if you have ldap_start_tls_s)
                        ])
                        LDAP_LIBS="-lldap"
-                       AC_CHECK_LIB(ldap, ber_free,, [
+                       AC_CHECK_LIB(ldap, ber_free, [
+                         # do nothing, default is to add -lldap to LIBS
+                       ], [
                          AC_CHECK_LIB(lber, ber_free, [
                            LDAP_LIBS="$LDAP_LIBS -llber"
                          ])

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index ea303dcf52c3ce40b776d94069266c03f723225a..b32b1369867d1f892517fd3eaf6a93af2fa88044 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -149,12 +149,8 @@ libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_BUILD
 libauthdb_ldap_la_SOURCES = $(ldap_sources)
 endif
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
 
 checkpassword_reply_LDADD = $(LIBDOVECOT)
 checkpassword_reply_DEPENDENCIES = $(LIBDOVECOT_DEPS)

diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index 9d9e7a379575e6ba4d28f2743aab49cf3d07035d..e420bb453fd4bc8da3a833cd7146d99a3cfc2c09 100644 (file)
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -89,9 +89,5 @@ headers = \
        imap-status.h \
        imap-sync.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
index a87d87ae1fb544c6ba5554adbca91cd1ea4cd8fd..e681f95e85a0b6f1cc904b09fc77adbce93f5470 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth/Makefile.am
@@ -17,9 +17,5 @@ headers = \
        auth-master.h \
        auth-server-connection.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-charset/Makefile.am b/src/lib-charset/Makefile.am
index b60b86c77cb2e61ca611b17e1424d9ecb308ba04..a8f811e2bca79b172e21ef7fd7596a255a69e47e 100644 (file)
--- a/src/lib-charset/Makefile.am
+++ b/src/lib-charset/Makefile.am
@@ -10,9 +10,5 @@ libcharset_la_SOURCES = \
 headers = \
        charset-utf8.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index 2a99ab4a758df5ea1c83fffd0754b000f97ea56d..b2d19a237de73eae9b672ba0d63ffc2cc690033a 100644 (file)
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -33,12 +33,8 @@ headers = \
        dict-sql.h \
        dict-sql-settings.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
 
 dict-drivers-register.c: Makefile $(top_builddir)/config.h
        rm -f $@

diff --git a/src/lib-dns/Makefile.am b/src/lib-dns/Makefile.am
index 9adaf9dfc4cd3e1a4062beb85b11b37cdf54f40f..751860a7c045c81ec6315f34ff026b5b5bae2177 100644 (file)
--- a/src/lib-dns/Makefile.am
+++ b/src/lib-dns/Makefile.am
@@ -9,9 +9,5 @@ libdns_la_SOURCES = \
 headers = \
        dns-lookup.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-imap/Makefile.am b/src/lib-imap/Makefile.am
index 65f9e05e3e96fbd9abe081358c351bd97adf63eb..a400646bb463c9b75ecbcb6e811adda59602dd89 100644 (file)
--- a/src/lib-imap/Makefile.am
+++ b/src/lib-imap/Makefile.am
@@ -35,12 +35,8 @@ headers = \
        imap-utf7.h \
        imap-util.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
 
 test_programs = \
        test-imap-match \

diff --git a/src/lib-index/Makefile.am b/src/lib-index/Makefile.am
index b5e9cb852b7fcc6568b62c0fafc7692d84cf4bb0..e3e8085e047dedc154621689f03c3e8eb504fc96 100644 (file)
--- a/src/lib-index/Makefile.am
+++ b/src/lib-index/Makefile.am
@@ -99,9 +99,5 @@ check-test: all-am
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am
index 9100d596bbdc7450e629ad5fb2c9ecd23edaf17d..4b5e8e8fe4c9c00f957142703d0f4b70f6dabc89 100644 (file)
--- a/src/lib-lda/Makefile.am
+++ b/src/lib-lda/Makefile.am
@@ -25,9 +25,5 @@ headers = \
        mail-send.h \
        smtp-client.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
index c097fffe1aecc6b53a918321b5604bd4bcf115be..e320de1c67f5de443d7587ae67329679951b13e9 100644 (file)
--- a/src/lib-mail/Makefile.am
+++ b/src/lib-mail/Makefile.am
@@ -46,12 +46,8 @@ headers = \
        rfc2231-parser.h \
        rfc822-parser.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
 
 test_programs = \
        test-istream-dot \

diff --git a/src/lib-master/Makefile.am b/src/lib-master/Makefile.am
index 2a1d4d26322d390491eeea131a62cc4712e305c1..588e1e017f2de9866c635302dbb1ac683b1f23c5 100644 (file)
--- a/src/lib-master/Makefile.am
+++ b/src/lib-master/Makefile.am
@@ -32,9 +32,5 @@ headers = \
        service-settings.h \
        syslog-util.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am
index 24058174b5fda372dc40ca1adc547c2d68bfa887..829a84b4bfe65fdd8b59253879d734face310e53 100644 (file)
--- a/src/lib-settings/Makefile.am
+++ b/src/lib-settings/Makefile.am
@@ -11,9 +11,5 @@ headers = \
        settings.h \
        settings-parser.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index 83e6f8ed1d5a17f4515a257ad6cda002990a766e..91d286f75e90ccb3c25a3d1fc6c90ec3814ef973 100644 (file)
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -68,12 +68,8 @@ headers = \
        sql-api-private.h \
        sql-pool.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
 
 sql-drivers-register.c: Makefile
        rm -f $@

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index dddc2924c91bf90b2e3a16f6cd421794f89f518a..17cb412114c79b35b856c3fe07a55f1fc7168c60 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -76,10 +76,6 @@ libstorage_test_a_SOURCES = \
 test_headers = \
        test-mail-storage.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-  noinst_HEADERS = $(test_headers)
-else
-  noinst_HEADERS = $(headers) $(test_headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+noinst_HEADERS = $(test_headers)

diff --git a/src/lib-storage/index/Makefile.am b/src/lib-storage/index/Makefile.am
index 60b39b6cb55239ba10fba2c8b0ae09ae916fff78..5f8483bea0e2be35ba6fe0bfdafc9c2aa23378eb 100644 (file)
--- a/src/lib-storage/index/Makefile.am
+++ b/src/lib-storage/index/Makefile.am
@@ -63,9 +63,5 @@ check-test: all-am
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/cydir/Makefile.am b/src/lib-storage/index/cydir/Makefile.am
index 32a7ca1e11b948d3de7c468576ec92d94ca72108..4be4848ccdad897f499961a863ad74807aa81c4c 100644 (file)
--- a/src/lib-storage/index/cydir/Makefile.am
+++ b/src/lib-storage/index/cydir/Makefile.am
@@ -18,9 +18,5 @@ headers = \
        cydir-storage.h \
        cydir-sync.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/dbox-common/Makefile.am b/src/lib-storage/index/dbox-common/Makefile.am
index bba8d0f086d003445bf197a6da041d8d85293da2..30cb575cacd6bbb39d6067b8c696a8b5532b4e71 100644 (file)
--- a/src/lib-storage/index/dbox-common/Makefile.am
+++ b/src/lib-storage/index/dbox-common/Makefile.am
@@ -24,9 +24,5 @@ headers = \
        dbox-storage.h \
        dbox-sync-rebuild.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/dbox-multi/Makefile.am b/src/lib-storage/index/dbox-multi/Makefile.am
index 5563c21ec145b3965247c33a6ce9e118cab9f16d..89dcd34f8b1eeb883af9b3cbc8a05b94a0ddbba5 100644 (file)
--- a/src/lib-storage/index/dbox-multi/Makefile.am
+++ b/src/lib-storage/index/dbox-multi/Makefile.am
@@ -30,9 +30,5 @@ headers = \
        mdbox-storage-rebuild.h \
        mdbox-sync.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/dbox-single/Makefile.am b/src/lib-storage/index/dbox-single/Makefile.am
index 7b97a28f569db612bb6c7b98770af41c787748a8..e8f54ff663c9846626996e3f22ecb18df6fc5c53 100644 (file)
--- a/src/lib-storage/index/dbox-single/Makefile.am
+++ b/src/lib-storage/index/dbox-single/Makefile.am
@@ -25,9 +25,5 @@ headers = \
        sdbox-storage.h \
        sdbox-sync.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/maildir/Makefile.am b/src/lib-storage/index/maildir/Makefile.am
index 99221d8bbfcb12d1206f3e0bd004ea815453b6f7..d155d55a0ff1c3a00806a866525b21de5706eb7d 100644 (file)
--- a/src/lib-storage/index/maildir/Makefile.am
+++ b/src/lib-storage/index/maildir/Makefile.am
@@ -30,9 +30,5 @@ headers = \
        maildir-sync.h \
        maildir-uidlist.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/mbox/Makefile.am b/src/lib-storage/index/mbox/Makefile.am
index 7d4c842e6ab1fb6180081caa48803a407684f879..69ac808aa0f88b5ed00d96d30b5d485e9e8b6e5b 100644 (file)
--- a/src/lib-storage/index/mbox/Makefile.am
+++ b/src/lib-storage/index/mbox/Makefile.am
@@ -33,9 +33,5 @@ headers = \
        mbox-storage.h \
        mbox-sync-private.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/raw/Makefile.am b/src/lib-storage/index/raw/Makefile.am
index ad747d28c55a13c193f338049814461b01092bad..58a9df3bc2e9d60f374098d6d3ae6fc036ec2154 100644 (file)
--- a/src/lib-storage/index/raw/Makefile.am
+++ b/src/lib-storage/index/raw/Makefile.am
@@ -17,9 +17,5 @@ headers = \
        raw-storage.h \
        raw-sync.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/shared/Makefile.am b/src/lib-storage/index/shared/Makefile.am
index 43a41b521688ebcfc66a21cc872288cdadd17c36..07980d6d7a067d157663365cd13c7451bd969f34 100644 (file)
--- a/src/lib-storage/index/shared/Makefile.am
+++ b/src/lib-storage/index/shared/Makefile.am
@@ -15,9 +15,5 @@ libstorage_shared_la_SOURCES = \
 headers = \
        shared-storage.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/list/Makefile.am b/src/lib-storage/list/Makefile.am
index 6b4db3dc22fa422cc2a11fd9a071c46e6bfb8484..7b8649fd5db7ce836dbda60bad4a78dbeab62815 100644 (file)
--- a/src/lib-storage/list/Makefile.am
+++ b/src/lib-storage/list/Makefile.am
@@ -29,9 +29,5 @@ headers = \
        mailbox-list-subscriptions.h \
        subscription-file.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-test/Makefile.am b/src/lib-test/Makefile.am
index 0be31e3201e80be718c57a48172e873675e89eef..6220808e2545dad2c6f6180484e771b5459c7410 100644 (file)
--- a/src/lib-test/Makefile.am
+++ b/src/lib-test/Makefile.am
@@ -10,9 +10,5 @@ libtest_la_SOURCES = \
 headers = \
        test-common.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index cec20cd8a74ffd8c229491733d10071cdb85fd47..78f626f80c32e4ef180b1b5e65e4fc9ad6fcc925 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -260,10 +260,6 @@ check-test: all-am
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-  noinst_HEADERS = $(test_headers)
-else
-  noinst_HEADERS = $(headers) $(test_headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+noinst_HEADERS = $(test_headers)

diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am
index ba7b99d35f9982486acb087a8a15d5636015d7fd..8f28334bda78036ef09a36f516c41e79814d3f3c 100644 (file)
--- a/src/login-common/Makefile.am
+++ b/src/login-common/Makefile.am
@@ -34,12 +34,8 @@ headers = \
        sasl-server.h \
        ssl-proxy.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
 
 pkglib_LTLIBRARIES = libdovecot-login.la
 libdovecot_login_la_SOURCES = 

diff --git a/src/plugins/notify/Makefile.am b/src/plugins/notify/Makefile.am
index addc02ddb0a60fbc4bfbe0c924608492a0e19849..d10c3763b9cec31c2f0be7354980371aa97d3c60 100644 (file)
--- a/src/plugins/notify/Makefile.am
+++ b/src/plugins/notify/Makefile.am
@@ -21,9 +21,5 @@ headers = \
        notify-plugin.h \
        notify-plugin-private.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index b7291a626dfee558949133ec8a0ccfeb72013581..689d3675bc67be4f75b931fe243aa70c577a98c8 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -38,9 +38,5 @@ headers = \
        pop3-common.h \
        pop3-settings.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)