[Libreoffice-commits] .: 2 commits - configure.in m4/mingw.m4
David Tardon
dtardon at kemper.freedesktop.org
Tue Feb 21 05:01:11 PST 2012
configure.in | 12 +++----
m4/mingw.m4 | 90 ++++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 62 insertions(+), 40 deletions(-)
New commits:
commit 0c128345eaa94686b67039346b7ce20ef43ab024
Author: David Tardon <dtardon at redhat.com>
Date: Tue Feb 21 13:41:37 2012 +0100
reintroduce hardcoded dll names as defaults
diff --git a/configure.in b/configure.in
index 12ce546..c099579 100644
--- a/configure.in
+++ b/configure.in
@@ -5651,7 +5651,7 @@ if test "$with_system_expat" = "yes"; then
[AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
[AC_MSG_RESULT(expat library not found or functional.)], [])
- libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS])
+ libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS],[libexpat-1.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_EXPAT=NO
@@ -5843,7 +5843,7 @@ if test "$with_system_libxml" = "yes"; then
AC_MSG_ERROR([xsltproc is required])
fi
- libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS])
+ libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS],[libxslt-1.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO
@@ -5893,7 +5893,7 @@ if test "$with_system_libxml" = "yes"; then
AC_MSG_ERROR([xmllint is required])
fi
- libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS])
+ libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS],[zlib1.dll libxml2-2.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXML=NO
@@ -6694,7 +6694,7 @@ if test "$with_system_curl" = "yes"; then
;;
esac
- libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS])
+ libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS],[libintl-8.dll libidn-11.dll libnspr4.dll nssutil3.dll libplc4.dll libplds4.dll nss3.dll ssl3.dll libgpg-error-0.dll libgcrypt-11.dll libssh2-1.dll libcurl-4.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_CURL=NO
@@ -7599,7 +7599,7 @@ if test "$with_system_hunspell" = "yes"; then
HUNSPELL_LIBS=-lhunspell
fi
AC_LANG_POP([C++])
- libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS])
+ libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS],[libhunspell-1.3-0.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO
@@ -9794,7 +9794,7 @@ if test "$enable_cairo_canvas" = "yes" -a "$with_system_cairo" = "yes"; then
AC_LANG_POP([C])
fi
fi
- libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS])
+ libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS],[libfontconfig-1.dll libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll])
else
AC_MSG_RESULT([no])
commit 743a56fcce564c461c4ad86ad55edb069cc764bc
Author: David Tardon <dtardon at redhat.com>
Date: Tue Feb 21 13:37:53 2012 +0100
allow to pass default dll list
diff --git a/m4/mingw.m4 b/m4/mingw.m4
index 952b2ed..35d638c 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -1,36 +1,25 @@
-# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
+# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude],[?default-value])
# uses: CC, SED, WITH_MINGW
# --------------------------------------------------------------------
AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
[if test "$WITH_MINGW" = yes -a -n "$CC"; then
_libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
- for _libo_mingw_lib in $1; do
- _libo_mingw_lib="$_libo_mingw_libdir/$_libo_mingw_lib.la"
- _libo_mingw_find_dll([$_libo_mingw_lib],[$3],[_libo_mingw_new_dll])
- if test -n "$_libo_mingw_new_dll"; then
- _libo_mingw_new_dlls="$_libo_mingw_new_dll"
- fi
-
- _libo_mingw_get_libtool_var([dependency_libs],[$_libo_mingw_lib],[_libo_mingw_dep_libs])
- for _libo_mingw_dep_lib in $_libo_mingw_dep_libs; do
- if test "${_libo_mingw_dep_lib%.la}" != "$_libo_mingw_dep_lib"; then
- _libo_mingw_new_dll=''
- _libo_mingw_find_dll([$_libo_mingw_dep_lib],[$3],[_libo_mingw_new_dll])
- if test -n "$_libo_mingw_new_dll"; then
- _libo_mingw_new_dlls="$_libo_mingw_new_dlls $_libo_mingw_new_dll"
- fi
- fi
- done
- $2="$_libo_mingw_new_dlls"
- done
+ _libo_mingw_found_la=
+ _libo_mingw_test_la([$1],[_libo_mingw_found_la],[$_libo_mingw_libdir])
+ if test "$_libo_mingw_found_la" = yes; then
+ _libo_mingw_find_dlls([$1],[$2],[$3],[$_libo_mingw_libdir])
+ else
+ # no .la files found, use defaults
+ $2="$4"
+ fi
fi[]dnl
]) # libo_FIND_MINGW_EXTERNAL_DLLS
-# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable])
+# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable],[?default-value])
# uses: CC, SED, WITH_MINGW
# --------------------------------------------------------
AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS],
-[libo_FIND_MINGW_EXTERNAL_DLLS([$1],[_libo_mingw_found_dlls],[$$2])
+[libo_FIND_MINGW_EXTERNAL_DLLS([$1],[_libo_mingw_found_dlls],[$$2],[$3])
if test -n "$_libo_mingw_found_dlls"; then
$2="$$2 $_libo_mingw_found_dlls"
fi[]dnl
@@ -43,18 +32,51 @@ m4_define([_libo_mingw_get_libtool_var],
# _libo_mingw_find_dll([library],[dlls],[out-var])
m4_define([_libo_mingw_find_dll],
-[if test -f "$1"; then
- _libo_mingw_get_libtool_var([dlname],[$1],[_libo_mingw_dlname])
- _libo_mingw_dlname=`basename $_libo_mingw_dlname`
- _libo_mingw_dll_present=
- for _libo_mingw_dll in $2; do
- if test "$_libo_mingw_dlname" = "$_libo_mingw_dll"; then
- _libo_mingw_dll_present=yes
- break
- fi
- done
- if test -z "$_libo_mingw_dll_present"; then
- $3="$_libo_mingw_dlname"
+[_libo_mingw_get_libtool_var([dlname],[$1],[_libo_mingw_dlname])
+_libo_mingw_dlname=`basename $_libo_mingw_dlname`
+_libo_mingw_dll_present=
+for _libo_mingw_dll in $2; do
+ if test "$_libo_mingw_dlname" = "$_libo_mingw_dll"; then
+ _libo_mingw_dll_present=yes
+ break
fi
+done
+if test -z "$_libo_mingw_dll_present"; then
+ $3="$_libo_mingw_dlname"
fi[]dnl
]) # _libo_mingw_find_dll
+
+# _libo_mingw_find_dlls([libraries],[dlls],[out-var],[libdir])
+m4_define([_libo_mingw_find_dlls],
+[_libo_mingw_new_dlls=
+for _libo_mingw_lib in $1; do
+ _libo_mingw_lib="$4/$_libo_mingw_lib.la"
+ _libo_mingw_new_dll=
+ _libo_mingw_find_dll([$_libo_mingw_lib],[$3 $_libo_mingw_new_dlls],[_libo_mingw_new_dll])
+ if test -n "$_libo_mingw_new_dll"; then
+ _libo_mingw_new_dlls="$_libo_mingw_new_dlls $_libo_mingw_new_dll"
+ fi
+
+ _libo_mingw_get_libtool_var([dependency_libs],[$_libo_mingw_lib],[_libo_mingw_dep_libs])
+ for _libo_mingw_dep_lib in $_libo_mingw_dep_libs; do
+ if test "${_libo_mingw_dep_lib%.la}" != "$_libo_mingw_dep_lib"; then
+ _libo_mingw_new_dll=''
+ _libo_mingw_find_dll([$_libo_mingw_dep_lib],[$3 $_libo_mingw_new_dlls],[_libo_mingw_new_dll])
+ if test -n "$_libo_mingw_new_dll"; then
+ _libo_mingw_new_dlls="$_libo_mingw_new_dlls $_libo_mingw_new_dll"
+ fi
+ fi
+ done
+done
+$2="$_libo_mingw_new_dlls"[]dnl
+]) # _libo_mingw_find_dlls
+
+# _libo_mingw_test_la([libraries],[out-var],[libdir])
+m4_define([_libo_mingw_test_la],
+[for _libo_mingw_lib in $1; do
+ if test -f "$3/$_libo_mingw_lib.la"; then
+ $2=yes
+ break
+ fi
+done[]dnl
+]) # _libo_mingw_test_la
More information about the Libreoffice-commits
mailing list