Merge r3352 from sogo branch

[jelmer/openchange.git] / config.mk.in

diff --git a/config.mk.in b/config.mk.in
index 850e3ee348a79f425bf9ce0531668e91aa02a4e6..6a621deeb902f33d98bb0cb6e31616406214128c 100644 (file)
--- a/config.mk.in
+++ b/config.mk.in
@@ -35,7 +35,8 @@ CFLAGS=@CFLAGS@ @COMPILER_OPTIONS_C@ @ASSERT_DEFINITION@ @SUBUNIT_CFLAGS@ \
        -DMAPISTORE_BACKEND_INSTALLDIR=\"$(libdir)/mapistore_backends\"                         \
        -DMAPISTORE_MAPPING_PATH=\"$(prefix)/private/mapistore\"                                        \
        -DLZXPRESS_DATADIR=\"$(datadir)/mapitest/lzxpress\"                                     \
-       -DLZFU_DATADIR=\"$(datadir)/mapitest/lzfu\"
+       -DLZFU_DATADIR=\"$(datadir)/mapitest/lzfu\"                                             \
+       -DHAVE_ICAL_0_46=@have_libical_0_46@
 
 # This value should be determined by configure at some point
 SHLIBEXT=so
@@ -43,6 +44,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 
 SAMBA_CFLAGS=@SAMBA_CFLAGS@
 SAMBA_LIBS=@SAMBA_LIBS@
+# If you have problems linking to samba-util-common (Fedora 13/14), try this instead.
+# You'll also need to fix your LD_LIBRARY_PATH
+# SAMBA_LIBS=@SAMBA_LIBS@  -L@sambaprefix@/lib/samba -lsamba-util-common
 
 LDB_CFLAGS=@LDB_CFLAGS@
 LDB_LIBS=@LDB_LIBS@
@@ -54,7 +58,7 @@ TALLOC_CFLAGS=@TALLOC_CFLAGS@
 TALLOC_LIBS=@TALLOC_LIBS@
 
 CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS)
-LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS)
+LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS) $(RT_LIBS)
 LDFLAGS+=@LDFLAGS@
 
 THREAD_LIBS=@THREAD_LIBS@
@@ -64,6 +68,7 @@ SAMBASERVER_CFLAGS=@SAMBASERVER_CFLAGS@
 SAMBASERVER_LIBS=@SAMBASERVER_LIBS@
 
 DL_LIBS=@DL_LIBS@
+RT_LIBS=@RT_LIBS@
 
 # Assign CFLAGS to CXXFLAGS
 CXXFLAGS=@CFLAGS@ @COMPILER_OPTIONS_CXX@ $(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS)
@@ -103,9 +108,6 @@ OC_MAPISTORE_CLEAN=@OC_MAPISTORE_CLEAN@
 OC_MAPISTORE_INSTALL=@OC_MAPISTORE_INSTALL@
 OC_MAPISTORE_UNINSTALL=@OC_MAPISTORE_UNINSTALL@
 
-SQLITE_CFLAGS=@SQLITE_CFLAGS@
-SQLITE_LIBS=@SQLITE_LIBS@
-
 MAPISTORE_TEST=@MAPISTORE_TEST@
 
 SUBUNIT_LIBS=@SUBUNIT_LIBS@