From: Timo Sirainen Date: Thu, 8 Apr 2010 01:49:47 +0000 (+0300) Subject: configure: Removed --enable-header-install. It's now always enabled. X-Git-Tag: 2.0.beta5~157 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53f37d41e1abb068131320f39f870fc92e81f560;p=thirdparty%2Fdovecot%2Fcore.git 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 07d046f58f..4d6924571e 100644 --- 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 847f2f9097..0067fc68a6 100644 --- 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 ea303dcf52..b32b136986 100644 --- 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 9d9e7a3795..e420bb453f 100644 --- 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 a87d87ae1f..e681f95e85 100644 --- 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 b60b86c77c..a8f811e2bc 100644 --- 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 2a99ab4a75..b2d19a237d 100644 --- 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 9adaf9dfc4..751860a7c0 100644 --- 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 65f9e05e3e..a400646bb4 100644 --- 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 b5e9cb852b..e3e8085e04 100644 --- 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 9100d596bb..4b5e8e8fe4 100644 --- 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 c097fffe1a..e320de1c67 100644 --- 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 2a1d4d2632..588e1e017f 100644 --- 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 24058174b5..829a84b4bf 100644 --- 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 83e6f8ed1d..91d286f75e 100644 --- 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 dddc2924c9..17cb412114 100644 --- 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 60b39b6cb5..5f8483bea0 100644 --- 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 32a7ca1e11..4be4848ccd 100644 --- 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 bba8d0f086..30cb575cac 100644 --- 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 5563c21ec1..89dcd34f8b 100644 --- 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 7b97a28f56..e8f54ff663 100644 --- 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 99221d8bbf..d155d55a0f 100644 --- 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 7d4c842e6a..69ac808aa0 100644 --- 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 ad747d28c5..58a9df3bc2 100644 --- 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 43a41b5216..07980d6d7a 100644 --- 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 6b4db3dc22..7b8649fd5d 100644 --- 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 0be31e3201..6220808e25 100644 --- 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 cec20cd8a7..78f626f80c 100644 --- 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 ba7b99d35f..8f28334bda 100644 --- 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 addc02ddb0..d10c3763b9 100644 --- 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 b7291a626d..689d3675bc 100644 --- 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)