[dovecot-cvs] dovecot-sieve/src/libsieve Makefile.am,1.3,1.4

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot-sieve/src/libsieve
In directory talvi:/tmp/cvs-serv27650/src/libsieve

Modified Files:
	Makefile.am 
Log Message:
Support compiling against installed dovecot-config and headers. This way
sievec and sieved aren't compiled though because liblib.a doesn't exist.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot-sieve/src/libsieve/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	1 Jul 2006 18:50:40 -0000	1.3
+++ Makefile.am	22 Feb 2007 21:52:30 -0000	1.4
@@ -1,14 +1,12 @@
 pkglibexecdir = $(libexecdir)/dovecot
 
-pkglibexec_PROGRAMS = sievec sieved
-
 noinst_LTLIBRARIES = libsieve.la
 
 AM_YFLAGS = -d -p $*
 
 AM_CPPFLAGS = \
-	-I$(dovecotdir) \
-	-I$(dovecotdir)/src/lib \
+	-I$(dovecot_incdir) \
+	-I$(dovecot_incdir)/src/lib \
 	-I$(top_srcdir)/src
 
 addr-lex.c: addr-lex.l
@@ -17,23 +15,6 @@
 sieve-lex.c: sieve-lex.l
 	$(LEX) -t sieve-lex.l > sieve-lex.c
 
-sievec_SOURCES = \
-	sievec.c \
-	../map.c \
-	../imparse.c
-
-sieved_SOURCES = \
-	sieved.c \
-	../map.c
-
-sievec_LDADD = \
-	libsieve.la \
-	$(dovecotdir)/src/lib/liblib.a
-
-sieved_LDADD = \
-	libsieve.la \
-	$(dovecotdir)/src/lib/liblib.a
-
 libsieve_la_SOURCES = \
 	addr.y \
 	sieve.y \
@@ -64,10 +45,36 @@
 	sieve_interface.h \
 	tree.h
 
+if HAVE_DOVECOT_LIBS
+pkglibexec_PROGRAMS = sievec sieved
+
+sievec_SOURCES = \
+	sievec.c \
+	../map.c \
+	../imparse.c
+
+sieved_SOURCES = \
+	sieved.c \
+	../map.c
+
+sievec_LDADD = \
+	libsieve.la \
+	$(dovecotdir)/src/lib/liblib.a
+
+sieved_LDADD = \
+	libsieve.la \
+	$(dovecotdir)/src/lib/liblib.a
+
+notbuilt_sources =
+else
+notbuilt_sources = sievec.c sieved.c
+endif
+
 EXTRA_DIST = \
 	addr-lex.l \
 	sieve-lex.l \
 	AUTHORS \
 	COPYING \
 	NEWS \
-	README
+	README \
+	$(notbuilt_sources)