$OpenBSD: patch-Makefile_in,v 1.18 2019/08/19 14:37:53 robert Exp $

Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -931,7 +931,7 @@ am__libkcutil_la_SOURCES_DIST = common/ConsoleTable.cp
 libkcutil_la_OBJECTS = $(am_libkcutil_la_OBJECTS)
 libkcutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(libkcutil_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(CXXFLAGS) $(libkcutil_la_LDFLAGS) $(LDFLAGS) -lkvm -o $@
 @ENABLE_BASE_TRUE@am_libkcutil_la_rpath = -rpath $(libdir)
 @ENABLE_BASE_TRUE@libmapi_la_DEPENDENCIES = libkcutil.la \
 @ENABLE_BASE_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1748,6 +1748,7 @@ systemunitdir = @systemunitdir@
 sysusersdir = @sysusersdir@
 target_alias = @target_alias@
 tidy_CPPFLAGS = @tidy_CPPFLAGS@
+db_CPPFLAGS = @db_CPPFLAGS@
 tmpfilesdir = @tmpfilesdir@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -1819,7 +1820,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} -DLDAP_THREAD_SAFE \
 	${KRB5_CFLAGS} ${LDAP_FLAGS} ${libHX_CFLAGS} \
 	${MYSQL_INCLUDES} ${SSL_CFLAGS} \
 	${s3_CFLAGS} ${kcoidc_CFLAGS} ${TCMALLOC_CFLAGS} ${tidy_CPPFLAGS} \
-	${VMIME_CFLAGS} ${xapian_CFLAGS} ${XML2_CFLAGS}
+	${VMIME_CFLAGS} ${xapian_CFLAGS} ${XML2_CFLAGS} $(db_CPPFLAGS)
 
 
 #
@@ -1953,7 +1954,7 @@ dist_bin_SCRIPTS = $(am__append_4) $(am__append_6)
 @ENABLE_BASE_TRUE@	common/database.cpp common/include/kopano/database.hpp
 
 @ENABLE_BASE_TRUE@kopano_dbadm_CPPFLAGS = ${AM_CPPFLAGS}
-@ENABLE_BASE_TRUE@kopano_dbadm_LDADD = libkcutil.la ${MYSQL_LIBS}
+@ENABLE_BASE_TRUE@kopano_dbadm_LDADD = libkcutil.la ${MYSQL_LIBS} ${PROG_LIBS}
 
 #
 # kopano-fsck
@@ -2054,7 +2055,7 @@ dist_bin_SCRIPTS = $(am__append_4) $(am__append_6)
 @ENABLE_BASE_TRUE@	provider/server/ECThreadManager.cpp provider/server/ECThreadManager.h
 
 @ENABLE_BASE_TRUE@kopano_server_LDADD = \
-@ENABLE_BASE_TRUE@	libkcutil.la libkcserver.la libkcsoap.la ${GSOAP_LIBS} \
+@ENABLE_BASE_TRUE@	libkcutil.la libkcserver.la libkcsoap.la ${GSOAP_LIBS} ${INTL_LIBS} \
 @ENABLE_BASE_TRUE@	${clock_LIBS} ${CRYPTO_LIBS} ${icu_uc_LIBS} ${icu_i18n_LIBS} ${DL_LIBS} \
 @ENABLE_BASE_TRUE@	${MYSQL_LIBS} ${SSL_LIBS} ${PAM_LIBS} ${KRB5_LIBS} ${kcoidc_LIBS} -lpthread
 
@@ -2179,7 +2180,7 @@ dist_bin_SCRIPTS = $(am__append_4) $(am__append_6)
 
 @ENABLE_BASE_TRUE@libkcclient_la_LIBADD = \
 @ENABLE_BASE_TRUE@	libkcutil.la libkcfreebusy.la \
-@ENABLE_BASE_TRUE@	libmapi.la ${COND_libkcrosie_la} libkcsoap.la -lstdc++ \
+@ENABLE_BASE_TRUE@	libmapi.la ${COND_libkcrosie_la} libkcsoap.la \
 @ENABLE_BASE_TRUE@	${GSOAP_LIBS} ${ICU_LIBS} ${INTL_LIBS} ${SSL_LIBS} ${KRB5_LIBS}
 
 @ENABLE_BASE_TRUE@libkcclient_la_SYFLAGS = -Wl,--version-script=provider/provider.sym
@@ -2199,7 +2200,7 @@ dist_bin_SCRIPTS = $(am__append_4) $(am__append_6)
 @ENABLE_BASE_TRUE@	provider/contacts/ZCMAPIProp.h provider/contacts/ZCMAPIProp.cpp
 
 @ENABLE_BASE_TRUE@libkccontacts_la_LIBADD = \
-@ENABLE_BASE_TRUE@	libkcutil.la libmapi.la -lstdc++ ${ICU_LIBS}
+@ENABLE_BASE_TRUE@	libkcutil.la libmapi.la ${ICU_LIBS}
 
 @ENABLE_BASE_TRUE@libkccontacts_la_SYFLAGS = -Wl,--version-script=provider/provider.sym
 @ENABLE_BASE_TRUE@libkccontacts_la_LDFLAGS = ${AM_LDFLAGS} -avoid-version -module \
@@ -2532,7 +2533,7 @@ dist_bin_SCRIPTS = $(am__append_4) $(am__append_6)
 @ENABLE_BASE_TRUE@tests_rosie_SOURCES = tests/rosie.cpp
 @ENABLE_BASE_TRUE@tests_rosie_LDADD = libkcrosie.la
 @ENABLE_BASE_TRUE@tests_zcpmd5_SOURCES = tests/zcpmd5.cpp
-@ENABLE_BASE_TRUE@tests_zcpmd5_LDADD = ${CRYPTO_LIBS} libkcutil.la
+@ENABLE_BASE_TRUE@tests_zcpmd5_LDADD = ${CRYPTO_LIBS} ${PROG_LIBS} libkcutil.la
 
 #
 # soap generators
@@ -5539,7 +5540,7 @@ default.sym provider/plugin.sym provider/provider.sym 
 
 .PHONY: source-moved-check
 source-moved-check:
-	@${top_srcdir}/pwdcheck.sh "${abs_top_builddir}"
+	@${top_srcdir}/pwdcheck.sh "${abs_top_builddir}" || true
 
 .version:
 	echo "${PACKAGE_VERSION}" >$@
