dovecot-2.0: configure: Removed --enable-header-install. It's no...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Apr 8 04:49:59 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/eee1e2a1c25b
changeset: 11117:eee1e2a1c25b
user: Timo Sirainen <tss at iki.fi>
date: Thu Apr 08 04:49:47 2010 +0300
description:
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.
diffstat:
Makefile.am | 12 ++----------
configure.in | 14 +++-----------
src/auth/Makefile.am | 8 ++------
src/imap/Makefile.am | 8 ++------
src/lib-auth/Makefile.am | 8 ++------
src/lib-charset/Makefile.am | 8 ++------
src/lib-dict/Makefile.am | 8 ++------
src/lib-dns/Makefile.am | 8 ++------
src/lib-imap/Makefile.am | 8 ++------
src/lib-index/Makefile.am | 8 ++------
src/lib-lda/Makefile.am | 8 ++------
src/lib-mail/Makefile.am | 8 ++------
src/lib-master/Makefile.am | 8 ++------
src/lib-settings/Makefile.am | 8 ++------
src/lib-sql/Makefile.am | 8 ++------
src/lib-storage/Makefile.am | 10 +++-------
src/lib-storage/index/Makefile.am | 8 ++------
src/lib-storage/index/cydir/Makefile.am | 8 ++------
src/lib-storage/index/dbox-common/Makefile.am | 8 ++------
src/lib-storage/index/dbox-multi/Makefile.am | 8 ++------
src/lib-storage/index/dbox-single/Makefile.am | 8 ++------
src/lib-storage/index/maildir/Makefile.am | 8 ++------
src/lib-storage/index/mbox/Makefile.am | 8 ++------
src/lib-storage/index/raw/Makefile.am | 8 ++------
src/lib-storage/index/shared/Makefile.am | 8 ++------
src/lib-storage/list/Makefile.am | 8 ++------
src/lib-test/Makefile.am | 8 ++------
src/lib/Makefile.am | 10 +++-------
src/login-common/Makefile.am | 8 ++------
src/plugins/notify/Makefile.am | 8 ++------
src/pop3/Makefile.am | 8 ++------
31 files changed, 65 insertions(+), 197 deletions(-)
diffs (truncated from 524 to 300 lines):
diff -r e47de5f3caae -r eee1e2a1c25b Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b configure.in
--- 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"
])
diff -r e47de5f3caae -r eee1e2a1c25b src/auth/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/imap/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-auth/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-charset/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-dict/Makefile.am
--- 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 $@
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-dns/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-imap/Makefile.am
--- 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 \
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-index/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-lda/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-mail/Makefile.am
--- 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 \
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-master/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-settings/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-sql/Makefile.am
--- 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 $@
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-storage/Makefile.am
--- 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)
diff -r e47de5f3caae -r eee1e2a1c25b src/lib-storage/index/Makefile.am
--- 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
More information about the dovecot-cvs
mailing list