[dovecot-cvs] dovecot Makefile.am, 1.8.2.2, 1.8.2.3 configure.in, 1.277.2.61, 1.277.2.62 dovecot-config.in.in, 1.1.2.1, 1.1.2.2

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot
In directory talvi:/tmp/cvs-serv26755

Modified Files:
      Tag: branch_1_0
	Makefile.am configure.in dovecot-config.in.in 
Log Message:
Added --with-headers configure option to install .h files.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/Makefile.am,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- Makefile.am	13 Jun 2006 12:23:35 -0000	1.8.2.2
+++ Makefile.am	22 Feb 2007 21:50:07 -0000	1.8.2.3
@@ -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)
 

Index: configure.in
===================================================================
RCS file: /var/lib/cvs/dovecot/configure.in,v
retrieving revision 1.277.2.61
retrieving revision 1.277.2.62
diff -u -d -r1.277.2.61 -r1.277.2.62
--- configure.in	22 Feb 2007 17:36:55 -0000	1.277.2.61
+++ configure.in	22 Feb 2007 21:50:07 -0000	1.277.2.62
@@ -337,6 +337,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 # too many warnings

Index: dovecot-config.in.in
===================================================================
RCS file: /var/lib/cvs/dovecot/dovecot-config.in.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- dovecot-config.in.in	11 Jun 2006 11:07:40 -0000	1.1.2.1
+++ dovecot-config.in.in	22 Feb 2007 21:50:07 -0000	1.1.2.2
@@ -6,4 +6,5 @@
 RAND_LIBS="@RAND_LIBS@"
 MODULE_LIBS="@MODULE_LIBS@"
 
+dovecot_incdir=
 moduledir=