merge of '58dd5b5062c42f191897941cb537d17bb4d22cad'

and 'd8572a250b974dcb3ee2eff7964b86e79ecf315f'

Monotone-Parent: 58dd5b5062c42f191897941cb537d17bb4d22cad
Monotone-Parent: d8572a250b974dcb3ee2eff7964b86e79ecf315f
Monotone-Revision: 31f2502a7daa35d52fc302ad66e1d2510709ec85

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-12T21:35:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-10-12 21:35:57 +00:00

View File

@@ -9,11 +9,11 @@ LIBMAPI_CFLAGS = $(shell pkg-config libmapistore --cflags)
ifeq ($(LIBMAPI_CFLAGS),)
all install::
@echo "* Cannot build the OpenChange SOGo backend (empty CFLAGS)"
@echo "Cannot build the OpenChange SOGo backend (empty CFLAGS for libmapistore)"
else
LIBMAPI_LIBS = $(shell pkg-config libmapistore --libs)
LIBMAPI_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy
ADDITIONAL_INCLUDE_DIRS += $(LIBMAPI_CFLAGS) -I../SoObjects -I../SOPE
ADDITIONAL_LIB_DIRS += -L../SOGo/SOGo.framework/ -lSOGo -L../SOPE/GDLContentStore/obj/ $(LIBMAPI_LIBS)