diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-31 13:21:25 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-31 13:22:30 +0100 |
| commit | 069704d390d70afe507b5f049a472a6aefaed64d (patch) | |
| tree | e3a9d4d06025ba4018bcafe8d4a09f226f718161 | |
| parent | 13b967e0edf0372fbd76e3ec5282fac7de6763a8 (diff) | |
fdo#55514 libgmodule is needed too
Change-Id: Icee2ffbe18ea732220f174cd4bf433ceb03d128b
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | external/mingw-dlls/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 5 |
5 files changed, 10 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 581286282161..105b67234132 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -366,6 +366,7 @@ export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@ export MINGW_GCCDLL=@MINGW_GCCDLL@ export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@ export MINGW_GLIB_DLL=@MINGW_GLIB_DLL@ +export MINGW_GMODULE_DLL=@MINGW_GMODULE_DLL@ export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@ export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@ export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@ diff --git a/configure.ac b/configure.ac index 024aa9802dfc..0900d85c6f0f 100644 --- a/configure.ac +++ b/configure.ac @@ -11592,6 +11592,7 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3) libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag]) libo_MINGW_TRY_DLL([GLIB], [libglib-2.0]) + libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0]) else SYSTEM_LIBLANGTAG=NO AC_MSG_RESULT([no]) @@ -11607,6 +11608,7 @@ AC_SUBST(LIBLANGTAG_CFLAGS) AC_SUBST(LIBLANGTAG_LIBS) AC_SUBST([MINGW_LIBLANGTAG_DLL]) AC_SUBST([MINGW_GLIB_DLL]) +AC_SUBST([MINGW_GMODULE_DLL]) dnl =================================================================== dnl Test whether to build GLib or rely on the system version @@ -11631,6 +11633,7 @@ if test "$want_glib" = yes; then SYSTEM_GLIB=YES PKG_CHECK_MODULES( GLIB, glib-2.0 ) libo_MINGW_CHECK_DLL([GLIB], [libglib-2.0]) + libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0]) else AC_MSG_RESULT([internal]) SYSTEM_GLIB=NO diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index 9b9ceb28f7aa..57381fa878ca 100644 --- a/external/mingw-dlls/makefile.mk +++ b/external/mingw-dlls/makefile.mk @@ -52,6 +52,7 @@ MINGW_DLLS:= \ $(MINGW_FREETYPE_DLL) \ $(MINGW_GCRYPT_DLL) \ $(MINGW_GLIB_DLL) \ + $(MINGW_GMODULE_DLL) \ $(MINGW_GNUTLS_DLL) \ $(MINGW_GPG_ERROR_DLL) \ $(MINGW_GRAPHITE2_DLL) \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index c130b50da044..e1187243aa59 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -101,6 +101,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ MINGW_FREETYPE_DLL \ MINGW_GCRYPT_DLL \ MINGW_GLIB_DLL \ + MINGW_GMODULE_DLL \ MINGW_GNUTLS_DLL \ MINGW_GPG_ERROR_DLL \ MINGW_GRAPHITE2_DLL \ diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 0fcf0b8fd39c..dab712ae06ce 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -46,10 +46,13 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL ) #endif #endif -#ifdef SYSTEM_GLIB +#if defined SYSTEM_GLIB || defined SYSTEM_LIBLANGTAG #ifdef NEEDS_MINGW_GLIB_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL ) #endif +#ifdef NEEDS_MINGW_GMODULE_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Gmodule, MINGW_GMODULE_DLL ) +#endif #endif #ifdef SYSTEM_LIBLANGTAG |