Mercurial > dovecot > core-2.2
changeset 11117:eee1e2a1c25b HEAD
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.
line wrap: on
line diff
--- a/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -23,12 +23,8 @@ 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 @@ -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 @@ -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)
--- a/configure.in Thu Apr 08 04:48:55 2010 +0300 +++ b/configure.in Thu Apr 08 04:49:47 2010 +0300 @@ -254,16 +254,6 @@ 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 @@ 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" ])
--- a/src/auth/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/auth/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -149,12 +149,8 @@ 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)
--- a/src/imap/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/imap/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -89,9 +89,5 @@ 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)
--- a/src/lib-auth/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-auth/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -17,9 +17,5 @@ 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)
--- a/src/lib-charset/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-charset/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -10,9 +10,5 @@ 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)
--- a/src/lib-dict/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-dict/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -33,12 +33,8 @@ 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 $@
--- a/src/lib-dns/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-dns/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -9,9 +9,5 @@ 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)
--- a/src/lib-imap/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-imap/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -35,12 +35,8 @@ 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 \
--- a/src/lib-index/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-index/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -99,9 +99,5 @@ 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)
--- a/src/lib-lda/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-lda/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -25,9 +25,5 @@ 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)
--- a/src/lib-mail/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-mail/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -46,12 +46,8 @@ 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 \
--- a/src/lib-master/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-master/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -32,9 +32,5 @@ 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)
--- a/src/lib-settings/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-settings/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -11,9 +11,5 @@ 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)
--- a/src/lib-sql/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-sql/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -68,12 +68,8 @@ 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 $@
--- a/src/lib-storage/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -76,10 +76,6 @@ 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)
--- a/src/lib-storage/index/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -63,9 +63,5 @@ 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)
--- a/src/lib-storage/index/cydir/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/cydir/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -18,9 +18,5 @@ 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)
--- a/src/lib-storage/index/dbox-common/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/dbox-common/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -24,9 +24,5 @@ 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)
--- a/src/lib-storage/index/dbox-multi/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/dbox-multi/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -30,9 +30,5 @@ 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)
--- a/src/lib-storage/index/dbox-single/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/dbox-single/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -25,9 +25,5 @@ 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)
--- a/src/lib-storage/index/maildir/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/maildir/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -30,9 +30,5 @@ 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)
--- a/src/lib-storage/index/mbox/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/mbox/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -33,9 +33,5 @@ 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)
--- a/src/lib-storage/index/raw/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/raw/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -17,9 +17,5 @@ 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)
--- a/src/lib-storage/index/shared/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/index/shared/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -15,9 +15,5 @@ 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)
--- a/src/lib-storage/list/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-storage/list/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -29,9 +29,5 @@ 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)
--- a/src/lib-test/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib-test/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -10,9 +10,5 @@ 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)
--- a/src/lib/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/lib/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -260,10 +260,6 @@ 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)
--- a/src/login-common/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/login-common/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -34,12 +34,8 @@ 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 =
--- a/src/plugins/notify/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/plugins/notify/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -21,9 +21,5 @@ 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)
--- a/src/pop3/Makefile.am Thu Apr 08 04:48:55 2010 +0300 +++ b/src/pop3/Makefile.am Thu Apr 08 04:49:47 2010 +0300 @@ -38,9 +38,5 @@ 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)