@@ -9,7 +9,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${prefix}'
99AM_TESTS_ENVIRONMENT = export TEST_PATH=${top_srcdir}/data;
1010
1111lib_LTLIBRARIES = libgromox_common.la libgromox_dbop.la libgromox_epoll.la libgromox_mapi.la libgromox_exrpc.la libgromox_rpc.la ${program_plugins}
12- noinst_LTLIBRARIES = libphp_mapi .la libgromox_abtree .la
12+ noinst_LTLIBRARIES = libgromox_abtree .la libphp_mapi .la
1313pkglibexec_PROGRAMS = cgkrepair delivery delivery-queue event gromox-snapshot http imap midb pop3 timer zcore tools/authtry tools/eidprint tools/textmapquery
1414pkglib_LTLIBRARIES = libmapi4zf.la
1515version_sc_SYFLAGS = -Wl,--version-script=${srcdir}/default.sym
@@ -241,12 +241,9 @@ libphp_mapi_la_SOURCES = php_mapi/ext.hpp php_mapi/ext_pack.cpp php_mapi/mapi.cp
241241libphp_mapi_la_LIBADD = ${fmt_LIBS} ${libHX_LIBS} libgromox_common.la libgromox_mapi.la
242242# allow-shlib-undefined makes no sense for libphp_mapi_la, since it
243243# is a convenience archive (static archive in practice)
244- libmapi4zf_la_SOURCES =
244+ libmapi4zf_la_SOURCES = tests/zendfake.cpp
245245libmapi4zf_la_LDFLAGS = ${PHP_LDFLAGS}
246246libmapi4zf_la_LIBADD = libphp_mapi.la
247- if WITH_GNU_LD
248- libmapi4zf_la_LDFLAGS += -Wl,--allow-shlib-undefined
249- endif
250247mapi_la_SOURCES =
251248mapi_la_LDFLAGS = ${plugin_LDFLAGS} ${default_SYFLAGS} ${PHP_LDFLAGS}
252249if WITH_GNU_LD
@@ -255,7 +252,7 @@ endif
255252mapi_la_LIBADD = libphp_mapi.la
256253EXTRA_mapi_la_DEPENDENCIES = default.sym
257254
258- noinst_PROGRAMS = dldcheck tests/bdump tests/bodyconv tests/compress tests/dnsbl_check tests/exrpctest tests/gxl-383 tests/jsontest tests/lzxpress tests/oxcmail_ie tests/ucvttest tests/udb tests/utiltest tests/vcard tests/zendfake tools/tzdump
255+ noinst_PROGRAMS = dldcheck tests/bdump tests/bodyconv tests/compress tests/dnsbl_check tests/exrpctest tests/gxl-383 tests/jsontest tests/lzxpress tests/oxcmail_ie tests/ucvttest tests/udb tests/utiltest tests/vcard tools/tzdump
259256if HAVE_ESEDB
260257noinst_PROGRAMS += tests/epv_unpack
261258endif
@@ -290,8 +287,6 @@ tests_utiltest_SOURCES = tests/utiltest.cpp
290287tests_utiltest_LDADD = ${libHX_LIBS} libgromox_common.la libgromox_mapi.la
291288tests_vcard_SOURCES = tests/vcard.cpp
292289tests_vcard_LDADD = ${libHX_LIBS} libgromox_common.la libgromox_mapi.la
293- tests_zendfake_SOURCES = tests/zendfake.cpp
294- tests_zendfake_LDADD = libmapi4zf.la
295290tools_authtry_SOURCES = tools/authtry.cpp
296291tools_authtry_LDADD = ${libHX_LIBS} ${libldap_LIBS} libgromox_auth.la libgromox_authz.la libgromox_common.la libgxs_mysql_adaptor.la
297292tools_eidprint_SOURCES = tools/eidprint.cpp
@@ -424,7 +419,7 @@ uninstall-hook:
424419 rm -Rf ${DESTDIR}${pkgdatadir} /
425420
426421# On cross-compilation, dldcheck may fail to run, so allow exit code 126 (e.g. Linux) to pass
427- dldcheck_files = ${lib_LTLIBRARIES} ${program_plugins} ${pamlib_LTLIBRARIES}
422+ dldcheck_files = ${lib_LTLIBRARIES} ${program_plugins} ${pkglib_LTLIBRARIES} ${ pamlib_LTLIBRARIES}
428423dldcheck.stamp : dldcheck ${dldcheck_files}
429424 ${AM_V_GEN} LD_LIBRARY_PATH=" ${abs_builddir} /.libs:$$ LD_LIBRARY_PATH" ./dldcheck " $@ " ${dldcheck_files} ; rv=" $$ ?" ; test " $$ rv" ! = 2
430425
0 commit comments