Merge r3352 from sogo branch

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

diff --git a/config.mk.in b/config.mk.in
index 832e9a74d617c2cf201fc236e4ed790d460dfb67..6a621deeb902f33d98bb0cb6e31616406214128c 100644 (file)
--- a/config.mk.in
+++ b/config.mk.in
@@ -10,9 +10,9 @@ PIDL=@PIDL@
 PERL=@PERL@
 DOXYGEN=@DOXYGEN@
 INSTALL=@INSTALL@
+SED=sed -i 's/"\(.*\)\/\(.*\)\.h"/<\1\/\2.h>/g'
 PYTHON=@PYTHON@
 PYTHON_CONFIG=@PYTHON_CONFIG@
-SMBTORTURE=@SMBTORTURE@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -29,10 +29,14 @@ pythondir=@pythondir@
 sambaprefix=@sambaprefix@
 
 DSOOPT=-shared -fPIC
-CFLAGS=@CFLAGS@ @COMPILER_OPTIONS_C@ @ASSERT_DEFINITION@ \
+CFLAGS=@CFLAGS@ @COMPILER_OPTIONS_C@ @ASSERT_DEFINITION@ @SUBUNIT_CFLAGS@ \
        -DDEFAULT_LDIF=\"$(datadir)/setup/profiles\"                                            \
+       -DMAPISTORE_LDIF=\"$(datadir)/setup/mapistore\"                                         \
        -DMAPISTORE_BACKEND_INSTALLDIR=\"$(libdir)/mapistore_backends\"                         \
-       -DMAPISTORE_MAPPING_PATH=\"$(prefix)/private/mapistore\"
+       -DMAPISTORE_MAPPING_PATH=\"$(prefix)/private/mapistore\"                                        \
+       -DLZXPRESS_DATADIR=\"$(datadir)/mapitest/lzxpress\"                                     \
+       -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
@@ -40,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@
@@ -50,12 +57,21 @@ TDB_LIBS=@TDB_LIBS@
 TALLOC_CFLAGS=@TALLOC_CFLAGS@
 TALLOC_LIBS=@TALLOC_LIBS@
 
-CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS)
-LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS)
+CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS)
+LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS) $(RT_LIBS)
 LDFLAGS+=@LDFLAGS@
 
+THREAD_LIBS=@THREAD_LIBS@
+THREAD_CFLAGS=@THREAD_CFLAGS@
+
+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)
+CXXFLAGS=@CFLAGS@ @COMPILER_OPTIONS_CXX@ $(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS)
 
 # OPENCHANGE LIBRARIES
 OC_IDL=@OC_IDL@
@@ -70,11 +86,7 @@ LIBMAPIADMIN_CFLAGS=@SAMR_CFLAGS@
 
 
 # TORTURE
-OC_TORTURE=@OC_TORTURE@
-OC_TORTURE_INSTALL=@OC_TORTURE_INSTALL@
-OC_TORTURE_UNINSTALL=@OC_TORTURE_UNINSTALL@
 SAMBA_MODULESDIR=${sambaprefix}/modules/
-TORTURE_MODULESDIR=${SAMBA_MODULESDIR}torture/
 SERVER_MODULESDIR=${SAMBA_MODULESDIR}dcerpc_server/
 
 # TOOLS
@@ -96,17 +108,9 @@ 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@
-
-# SWIG
-SWIGDIRS-ALL=@SWIGDIRSALL@
-SWIGDIRS-INSTALL=@SWIGDIRSINSTALL@
-SWIGDIRS-UNINSTALL=@SWIGDIRSUNINSTALL@
-
-SWIG=@SWIG@
+MAPISTORE_TEST=@MAPISTORE_TEST@
 
-PERL5DIR=@PERL5DIR@
+SUBUNIT_LIBS=@SUBUNIT_LIBS@
 
 # Python
 PYMAPIALL=@PYMAPIALL@
@@ -120,3 +124,8 @@ COVERAGE_INIT=@COVERAGE_INIT@
 
 MANUALLY_CREATE_SYMLINKS=@MANUALLY_CREATE_SYMLINKS@
 
+# Qt support
+QT4_CXXFLAGS=@Qt4_CFLAGS@
+QT4_LIBS=@Qt4_LIBS@
+MOC=@MOC@
+OPENCHANGE_QT4=@OPENCHANGE_QT4@