Mercurial > dovecot > original-hg > dovecot-1.2

changeset 5197:e77e4457d95c HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added --with-headers configure option to install .h files.
author Timo Sirainen <tss@iki.fi>
date Thu, 22 Feb 2007 23:50:46 +0200
parents f1b735b905f3
children 3e54aa4039bc
files Makefile.am configure.in dovecot-config.in.in src/auth/Makefile.am src/deliver/Makefile.am src/imap/Makefile.am src/lib-auth/Makefile.am src/lib-charset/Makefile.am src/lib-dict/Makefile.am src/lib-imap/Makefile.am src/lib-index/Makefile.am src/lib-mail/Makefile.am src/lib-settings/Makefile.am src/lib-sql/Makefile.am src/lib-storage/Makefile.am src/lib-storage/index/Makefile.am src/lib-storage/index/dbox/Makefile.am src/lib-storage/index/maildir/Makefile.am src/lib-storage/index/mbox/Makefile.am src/lib-storage/list/Makefile.am src/lib/Makefile.am src/pop3/Makefile.am
diffstat 22 files changed, 174 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -14,10 +14,18 @@
 	COPYING.MIT \
 	$(conf_DATA)
 
-noinst_DATA = dovecot-config
+if INSTALL_HEADERS
+  pkginclude_HEADERS = config.h
+  pkglib_DATA = dovecot-config
+else
+  noinst_HEADERS = $(headers)
+  noinst_DATA = dovecot-config
+endif
 
-dovecot-config: dovecot-config.in
-	cat dovecot-config.in|sed "s|moduledir=|moduledir=$(moduledir)|" > dovecot-config
+dovecot-config: dovecot-config.in Makefile
+	cat dovecot-config.in | sed \
+	-e "s|^moduledir=|moduledir=$(moduledir)|" \
+	-e "s|^dovecot_incdir=|dovecot_incdir=$(pkgincludedir)|" > dovecot-config
 
 CLEANFILES = $(noinst_DATA)
 
--- a/configure.in	Thu Feb 22 23:49:34 2007 +0200
+++ b/configure.in	Thu Feb 22 23:50:46 2007 +0200
@@ -357,6 +357,16 @@
 	want_docs=yes)
 AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes")
 
+AC_ARG_WITH(headers,
+[  --with-headers          Install development headers],
+	if test x$withval = xno; then
+		want_headers=no
+	else
+		want_headers=yes
+	fi,
+	want_headers=no)
+AM_CONDITIONAL(INSTALL_HEADERS, test "$want_headers" = "yes")
+
 dnl * gcc specific options
 if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
 	# -Wcast-qual -Wcast-align -Wconversion -Wunreachable-code # too many warnings
--- a/dovecot-config.in.in	Thu Feb 22 23:49:34 2007 +0200
+++ b/dovecot-config.in.in	Thu Feb 22 23:50:46 2007 +0200
@@ -6,4 +6,5 @@
 RAND_LIBS="@RAND_LIBS@"
 MODULE_LIBS="@MODULE_LIBS@"
 
+dovecot_incdir=
 moduledir=
--- a/src/auth/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/auth/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -88,7 +88,7 @@
 	userdb-vpopmail.c \
 	userdb-sql.c
 
-noinst_HEADERS = \
+headers = \
 	auth.h \
 	auth-cache.h \
 	auth-client-connection.h \
@@ -117,6 +117,13 @@
 	userdb-blocking.h \
 	userdb-vpopmail.h
 
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/auth
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
+
 checkpassword_reply_LDADD = \
 	../lib/liblib.a
 
--- a/src/deliver/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/deliver/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -47,9 +47,16 @@
 	mail-send.c \
 	smtp-client.c
 
-noinst_HEADERS = \
+headers = \
 	auth-client.h \
 	deliver.h \
 	duplicate.h \
 	mail-send.h \
 	smtp-client.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/deliver
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/imap/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/imap/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -88,7 +88,7 @@
 	namespace.c
 
 
-noinst_HEADERS = \
+headers = \
 	client.h \
 	commands.h \
 	commands-util.h \
@@ -101,3 +101,10 @@
 	imap-sync.h \
 	imap-thread.h \
 	namespace.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/imap
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-auth/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-auth/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -8,7 +8,14 @@
 	auth-server-connection.c \
 	auth-server-request.c
 
-noinst_HEADERS = \
+headers = \
 	auth-client.h \
 	auth-server-connection.h \
 	auth-server-request.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-auth
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-charset/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-charset/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -7,5 +7,12 @@
 	charset-iconv.c \
 	charset-utf8.c
 
-noinst_HEADERS = \
+headers = \
 	charset-utf8.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-charset
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-dict/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-dict/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -18,12 +18,19 @@
 	$(dist_sources) \
 	dict-drivers-register.c
 
-noinst_HEADERS = \
+headers = \
 	dict.h \
 	dict-client.h \
 	dict-private.h \
 	dict-sql.h
 
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-dict
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
+
 dict-drivers-register.c: Makefile
 	rm -f $@
 	echo '/* this file automatically generated by Makefile */' >$@
--- a/src/lib-imap/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-imap/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -15,7 +15,7 @@
 	imap-parser.c \
 	imap-util.c
 
-noinst_HEADERS = \
+headers = \
 	imap-base-subject.h \
 	imap-bodystructure.h \
 	imap-date.h \
@@ -24,3 +24,10 @@
 	imap-quote.h \
 	imap-parser.h \
 	imap-util.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-imap
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-index/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-index/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -32,7 +32,7 @@
         mailbox-list-index.c \
         mailbox-list-index-sync.c
 
-noinst_HEADERS = \
+headers = \
 	mail-cache.h \
 	mail-cache-private.h \
         mail-hash.h \
@@ -46,3 +46,10 @@
         mail-transaction-util.h \
         mailbox-list-index.h \
         mailbox-list-index-private.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-index
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-mail/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-mail/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -22,7 +22,7 @@
 	quoted-printable.c \
 	rfc822-parser.c
 
-noinst_HEADERS = \
+headers = \
 	istream-header-filter.h \
 	mail-types.h \
 	message-address.h \
@@ -40,3 +40,10 @@
 	message-size.h \
 	quoted-printable.h \
 	rfc822-parser.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-mail
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-settings/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-settings/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -6,5 +6,12 @@
 libsettings_a_SOURCES = \
 	settings.c
 
-noinst_HEADERS = \
+headers = \
 	settings.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-settings
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-sql/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-sql/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -16,10 +16,17 @@
 	$(dist_sources) \
 	sql-drivers-register.c
 
-noinst_HEADERS = \
+headers = \
 	sql-api.h \
 	sql-api-private.h
 
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-sql
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
+
 sql-drivers-register.c: Makefile
 	rm -f $@
 	echo '/* this file automatically generated by Makefile */' >$@
--- a/src/lib-storage/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-storage/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -16,7 +16,7 @@
 	mailbox-list.c \
 	mailbox-tree.c
 
-noinst_HEADERS = \
+headers = \
 	mail-copy.h \
 	mail-search.h \
 	mail-storage.h \
@@ -24,3 +24,10 @@
 	mailbox-list.h \
 	mailbox-list-private.h \
 	mailbox-tree.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-storage
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-storage/index/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-storage/index/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -21,7 +21,14 @@
 	index-sync.c \
 	index-transaction.c
 
-noinst_HEADERS = \
+headers = \
 	index-mail.h \
 	index-sort.h \
 	index-storage.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-storage/index/dbox/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-storage/index/dbox/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -20,10 +20,17 @@
 	dbox-transaction.c \
 	dbox-uidlist.c
 
-noinst_HEADERS = \
+headers = \
 	dbox-file.h \
 	dbox-format.h \
 	dbox-keywords.h \
 	dbox-storage.h \
 	dbox-sync.h \
 	dbox-uidlist.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/dbox
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-storage/index/maildir/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-storage/index/maildir/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -19,8 +19,15 @@
 	maildir-uidlist.c \
 	maildir-util.c
 
-noinst_HEADERS = \
+headers = \
 	maildir-keywords.h \
 	maildir-storage.h \
 	maildir-sync.h \
 	maildir-uidlist.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/maildir
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-storage/index/mbox/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-storage/index/mbox/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -23,7 +23,7 @@
 	mbox-storage.c \
 	mbox-transaction.c
 
-noinst_HEADERS = \
+headers = \
 	istream-raw-mbox.h \
 	mbox-file.h \
 	mbox-from.h \
@@ -31,3 +31,10 @@
 	mbox-md5.h \
 	mbox-storage.h \
 	mbox-sync-private.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/mbox
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib-storage/list/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib-storage/list/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -17,8 +17,15 @@
 	mailbox-list-maildir-iter.c \
 	subscription-file.c
 
-noinst_HEADERS = \
+headers = \
 	index-mailbox-list.h \
 	mailbox-list-fs.h \
 	mailbox-list-maildir.h \
 	subscription-file.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib-storage/list
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/lib/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/lib/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -88,7 +88,7 @@
 	var-expand.c \
 	write-full.c
 
-noinst_HEADERS = \
+headers = \
 	array.h \
 	array-decl.h \
 	backtrace-string.h \
@@ -163,3 +163,10 @@
 	utc-mktime.h \
 	var-expand.h \
 	write-full.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/lib
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif
--- a/src/pop3/Makefile.am	Thu Feb 22 23:49:34 2007 +0200
+++ b/src/pop3/Makefile.am	Thu Feb 22 23:50:46 2007 +0200
@@ -43,8 +43,15 @@
 	mail-storage-callbacks.c \
 	main.c
 
-noinst_HEADERS = \
+headers = \
 	capability.h \
 	client.h \
 	commands.h \
 	common.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/pop3
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif