Skip to content

C
core
Kaydet (Commit) 19d263f0 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

one variable to rule them all 

one variable to find them,
one variable to deliver them all and into filelist put them,
in $INSTDIR where the installer searches.

Change-Id: I989f578f0ed6f9ef9167522249b36d95c15bfd1b
üst 339306de
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 495 deletions
config_host.mk.in
Dosyayı görüntüle @ 19d263f0
...@@ -331,62 +331,15 @@ export MFC_INCLUDE=@MFC_INCLUDE@ ...@@ -331,62 +331,15 @@ export MFC_INCLUDE=@MFC_INCLUDE@
export MFC_LIB=@MFC_LIB@ export MFC_LIB=@MFC_LIB@
export MINGWCXX=@MINGWCXX@ export MINGWCXX=@MINGWCXX@
export MINGWSTRIP=@MINGWSTRIP@ export MINGWSTRIP=@MINGWSTRIP@
export MINGW_BOOST_DATE_TIME_DLL=@MINGW_BOOST_DATE_TIME_DLL@
export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@ export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@ export MINGW_DLLS=@MINGW_DLLS@
export MINGW_CURL_DLL=@MINGW_CURL_DLL@
export MINGW_EXPAT_DLL=@MINGW_EXPAT_DLL@
export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@
export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
export MINGW_GCCDLL=@MINGW_GCCDLL@ export MINGW_GCCDLL=@MINGW_GCCDLL@
export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@
export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@
export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@
export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
export MINGW_GXXDLL=@MINGW_GXXDLL@ export MINGW_GXXDLL=@MINGW_GXXDLL@
export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@
export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@
export MINGW_ICONV_DLL=@MINGW_ICONV_DLL@
export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@
export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
export MINGW_IDN_DLL=@MINGW_IDN_DLL@
export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
export MINGW_LIBLANGTAG_DLL=@MINGW_LIBLANGTAG_DLL@
export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@
export MINGW_MYTHES_DLL=@MINGW_MYTHES_DLL@
export MINGW_NEON_DLL=@MINGW_NEON_DLL@
export MINGW_NSPR4_DLL=@MINGW_NSPR4_DLL@
export MINGW_NSS3_DLL=@MINGW_NSS3_DLL@
export MINGW_NSSUTIL3_DLL=@MINGW_NSSUTIL3_DLL@
export MINGW_PIXMAN_DLL=@MINGW_PIXMAN_DLL@
export MINGW_PLC4_DLL=@MINGW_PLC4_DLL@
export MINGW_PLDS4_DLL=@MINGW_PLDS4_DLL@
export MINGW_PNG15_DLL=@MINGW_PNG15_DLL@
export MINGW_POPPLER_DLL=@MINGW_POPPLER_DLL@
export MINGW_PYTHON_DLL=@MINGW_PYTHON_DLL@
export MINGW_PYTHON_EXE=@MINGW_PYTHON_EXE@ export MINGW_PYTHON_EXE=@MINGW_PYTHON_EXE@
export MINGW_RAPTOR_DLL=@MINGW_RAPTOR_DLL@
export MINGW_RASQAL_DLL=@MINGW_RASQAL_DLL@
export MINGW_READLINE_DLL=@MINGW_READLINE_DLL@
export MINGW_REDLAND_DLL=@MINGW_REDLAND_DLL@
export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@ export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@ export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@ export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
export MINGW_SMIME3_DLL=@MINGW_SMIME3_DLL@
export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@
export MINGW_SSH2_DLL=@MINGW_SSH2_DLL@
export MINGW_SSL3_DLL=@MINGW_SSL3_DLL@
export MINGW_SSL_DLL=@MINGW_SSL_DLL@
export MINGW_SYSROOT=@MINGW_SYSROOT@ export MINGW_SYSROOT=@MINGW_SYSROOT@
export MINGW_TASN1_DLL=@MINGW_TASN1_DLL@
export MINGW_TERMCAP_DLL=@MINGW_TERMCAP_DLL@
export MINGW_ZLIB_DLL=@MINGW_ZLIB_DLL@
export MKDEPENDSOLVER=TRUE export MKDEPENDSOLVER=TRUE
export ML_EXE=@ML_EXE@ export ML_EXE=@ML_EXE@
export MOC4=@MOC4@ export MOC4=@MOC4@
......
configure.ac
Dosyayı görüntüle @ 19d263f0
...@@ -5236,6 +5236,7 @@ if test "$WITH_MINGW" = "yes"; then ...@@ -5236,6 +5236,7 @@ if test "$WITH_MINGW" = "yes"; then
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
AC_MSG_ERROR([cannot determine MinGW sysroot])]) AC_MSG_ERROR([cannot determine MinGW sysroot])])
fi fi
AC_SUBST([MINGW_DLLS])
AC_SUBST([MINGW_SYSROOT]) AC_SUBST([MINGW_SYSROOT])
dnl =================================================================== dnl ===================================================================
...@@ -7036,14 +7037,13 @@ if test "$with_system_jpeg" = "yes"; then ...@@ -7036,14 +7037,13 @@ if test "$with_system_jpeg" = "yes"; then
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], []) [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ], AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
[AC_MSG_CHECKING(jpeg library not found or fuctional)], []) [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
libo_MINGW_CHECK_DLL([JPEG], [libjpeg]) libo_MINGW_CHECK_DLL([libjpeg])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_JPEG=NO SYSTEM_JPEG=NO
BUILD_TYPE="$BUILD_TYPE JPEG" BUILD_TYPE="$BUILD_TYPE JPEG"
fi fi
AC_SUBST(SYSTEM_JPEG) AC_SUBST(SYSTEM_JPEG)
AC_SUBST([MINGW_JPEG_DLL])
dnl =================================================================== dnl ===================================================================
...@@ -7093,14 +7093,13 @@ if test "$with_system_expat" = "yes"; then ...@@ -7093,14 +7093,13 @@ if test "$with_system_expat" = "yes"; then
[AC_MSG_ERROR(expat.h not found. install expat)], []) [AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB([expat], [XML_ParserCreate], [:], AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
[AC_MSG_RESULT(expat library not found or functional.)], []) [AC_MSG_RESULT(expat library not found or functional.)], [])
libo_MINGW_CHECK_DLL([EXPAT], [libexpat]) libo_MINGW_CHECK_DLL([libexpat])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_EXPAT=NO SYSTEM_EXPAT=NO
BUILD_TYPE="$BUILD_TYPE EXPAT" BUILD_TYPE="$BUILD_TYPE EXPAT"
fi fi
AC_SUBST(SYSTEM_EXPAT) AC_SUBST(SYSTEM_EXPAT)
AC_SUBST([MINGW_EXPAT_DLL])
dnl =================================================================== dnl ===================================================================
dnl Check for system libcdr dnl Check for system libcdr
...@@ -7150,7 +7149,7 @@ dnl =================================================================== ...@@ -7150,7 +7149,7 @@ dnl ===================================================================
dnl Check for system lcms2 dnl Check for system lcms2
dnl =================================================================== dnl ===================================================================
if test "$with_system_lcms2" = "yes"; then if test "$with_system_lcms2" = "yes"; then
libo_MINGW_CHECK_DLL([LCMS2], [liblcms2]) libo_MINGW_CHECK_DLL([liblcms2])
else else
SYSTEM_LCMS2=NO SYSTEM_LCMS2=NO
fi fi
...@@ -7158,7 +7157,6 @@ libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/ ...@@ -7158,7 +7157,6 @@ libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/
if test "$GCC" = "yes"; then if test "$GCC" = "yes"; then
LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long" LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long"
fi fi
AC_SUBST([MINGW_LCMS2_DLL])
dnl =================================================================== dnl ===================================================================
dnl Check for system cppunit dnl Check for system cppunit
...@@ -7250,9 +7248,9 @@ if test "$with_system_libxml" = "yes"; then ...@@ -7250,9 +7248,9 @@ if test "$with_system_libxml" = "yes"; then
AC_MSG_ERROR([xsltproc is required]) AC_MSG_ERROR([xsltproc is required])
fi fi
libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt]) libo_MINGW_CHECK_DLL([libxslt])
libo_MINGW_CHECK_DLL([LIBEXSLT], [libexslt]) libo_MINGW_CHECK_DLL([libexslt])
libo_MINGW_TRY_DLL([ICONV], [iconv]) libo_MINGW_TRY_DLL([iconv])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO SYSTEM_LIBXSLT=NO
...@@ -7278,9 +7276,6 @@ AC_SUBST(LIBXSLT_CFLAGS) ...@@ -7278,9 +7276,6 @@ AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS) AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(LIBXSLT_MAJOR) AC_SUBST(LIBXSLT_MAJOR)
AC_SUBST(XSLTPROC) AC_SUBST(XSLTPROC)
AC_SUBST([MINGW_LIBEXSLT_DLL])
AC_SUBST([MINGW_LIBXSLT_DLL])
AC_SUBST([MINGW_ICONV_DLL])
# =================================================================== # ===================================================================
# Check for system libxml # Check for system libxml
...@@ -7309,8 +7304,8 @@ if test "$with_system_libxml" = "yes"; then ...@@ -7309,8 +7304,8 @@ if test "$with_system_libxml" = "yes"; then
AC_MSG_ERROR([xmllint is required]) AC_MSG_ERROR([xmllint is required])
fi fi
libo_MINGW_CHECK_DLL([LIBXML],[libxml2]) libo_MINGW_CHECK_DLL([libxml2])
libo_MINGW_TRY_DLL([ZLIB],[zlib1]) libo_MINGW_TRY_DLL([zlib1])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBXML=NO SYSTEM_LIBXML=NO
...@@ -7320,8 +7315,6 @@ AC_SUBST(SYSTEM_LIBXML) ...@@ -7320,8 +7315,6 @@ AC_SUBST(SYSTEM_LIBXML)
AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS) AC_SUBST(LIBXML_LIBS)
AC_SUBST(XMLLINT) AC_SUBST(XMLLINT)
AC_SUBST([MINGW_LIBXML_DLL])
AC_SUBST([MINGW_ZLIB_DLL])
# ===================================================================== # =====================================================================
# Checking for a Python interpreter with version >= 2.5 needed to build LO. # Checking for a Python interpreter with version >= 2.5 needed to build LO.
...@@ -7455,9 +7448,9 @@ if test $enable_python = system; then ...@@ -7455,9 +7448,9 @@ if test $enable_python = system; then
MINGW_PYTHON_EXE=python.exe], MINGW_PYTHON_EXE=python.exe],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
AC_MSG_ERROR([could not find python.exe])]) AC_MSG_ERROR([could not find python.exe])])
libo_MINGW_CHECK_DLL([PYTHON], [libpython$python_version]) libo_MINGW_CHECK_DLL([libpython$python_version])
libo_MINGW_CHECK_DLL([READLINE], [libreadline6]) libo_MINGW_CHECK_DLL([libreadline6])
libo_MINGW_CHECK_DLL([TERMCAP], [libtermcap]) libo_MINGW_CHECK_DLL([libtermcap])
# could we somehow extract the really mingw python version from # could we somehow extract the really mingw python version from
# actual distro package? # actual distro package?
# 2.6.2 currently on OpenSUSE 12.1? # 2.6.2 currently on OpenSUSE 12.1?
...@@ -7545,9 +7538,6 @@ AC_SUBST(PYTHON_VERSION) ...@@ -7545,9 +7538,6 @@ AC_SUBST(PYTHON_VERSION)
AC_SUBST(PYTHON_VERSION_MAJOR) AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR) AC_SUBST(PYTHON_VERSION_MINOR)
AC_SUBST([MINGW_PYTHON_EXE]) AC_SUBST([MINGW_PYTHON_EXE])
AC_SUBST([MINGW_PYTHON_DLL])
AC_SUBST([MINGW_READLINE_DLL])
AC_SUBST([MINGW_TERMCAP_DLL])
AC_MSG_CHECKING([whether to build the MariaDB/MySQL Connector extension]) AC_MSG_CHECKING([whether to build the MariaDB/MySQL Connector extension])
if test "x$enable_ext_mariadb_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then if test "x$enable_ext_mariadb_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then
...@@ -7898,18 +7888,18 @@ if test "$with_system_curl" = "yes"; then ...@@ -7898,18 +7888,18 @@ if test "$with_system_curl" = "yes"; then
;; ;;
esac esac
libo_MINGW_CHECK_DLL([CURL], [libcurl]) libo_MINGW_CHECK_DLL([libcurl])
libo_MINGW_TRY_DLL([INTL], [libintl]) libo_MINGW_TRY_DLL([libintl])
libo_MINGW_TRY_DLL([IDN], [libidn]) libo_MINGW_TRY_DLL([libidn])
libo_MINGW_TRY_DLL([NSPR4], [libnspr4]) libo_MINGW_TRY_DLL([libnspr4])
libo_MINGW_TRY_DLL([NSSUTIL3], [nssutil3]) libo_MINGW_TRY_DLL([nssutil3])
libo_MINGW_TRY_DLL([PLC4], [libplc4]) libo_MINGW_TRY_DLL([libplc4])
libo_MINGW_TRY_DLL([PLDS4], [libplds4]) libo_MINGW_TRY_DLL([libplds4])
libo_MINGW_TRY_DLL([NSS3], [nss3]) libo_MINGW_TRY_DLL([nss3])
libo_MINGW_TRY_DLL([SSL3], [ssl3]) libo_MINGW_TRY_DLL([ssl3])
libo_MINGW_TRY_DLL([GPG_ERROR], [libgpg-error]) libo_MINGW_TRY_DLL([libgpg-error])
libo_MINGW_TRY_DLL([GCRYPT], [libgcrypt]) libo_MINGW_TRY_DLL([libgcrypt])
libo_MINGW_TRY_DLL([SSH2], [libssh2]) libo_MINGW_TRY_DLL([libssh2])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_CURL=NO SYSTEM_CURL=NO
...@@ -7918,18 +7908,6 @@ fi ...@@ -7918,18 +7908,6 @@ fi
AC_SUBST(SYSTEM_CURL) AC_SUBST(SYSTEM_CURL)
AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS) AC_SUBST(CURL_LIBS)
AC_SUBST([MINGW_CURL_DLL])
AC_SUBST([MINGW_GCRYPT_DLL])
AC_SUBST([MINGW_GPG_ERROR_DLL])
AC_SUBST([MINGW_IDN_DLL])
AC_SUBST([MINGW_INTL_DLL])
AC_SUBST([MINGW_NSPR4_DLL])
AC_SUBST([MINGW_NSS3_DLL])
AC_SUBST([MINGW_NSSUTIL3_DLL])
AC_SUBST([MINGW_PLC4_DLL])
AC_SUBST([MINGW_PLDS4_DLL])
AC_SUBST([MINGW_SSH2_DLL])
AC_SUBST([MINGW_SSL3_DLL])
dnl =================================================================== dnl ===================================================================
dnl Check for system boost dnl Check for system boost
...@@ -7941,11 +7919,10 @@ if test "$with_system_boost" = "yes"; then ...@@ -7941,11 +7919,10 @@ if test "$with_system_boost" = "yes"; then
AX_BOOST_BASE AX_BOOST_BASE
AX_BOOST_DATE_TIME AX_BOOST_DATE_TIME
mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'` mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
libo_MINGW_TRY_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll]) libo_MINGW_TRY_DLL([$mingw_boost_date_time_dll])
if test -z "$MINGW_BOOST_DATE_TIME_DLL"; then if test -z "$MINGW_BOOST_DATE_TIME_DLL"; then
# if not found, try again with 'lib' prefix # if not found, try again with 'lib' prefix
libo_MINGW_CHECK_DLL([BOOST_DATE_TIME], libo_MINGW_CHECK_DLL([lib$mingw_boost_date_time_dll])
[lib$mingw_boost_date_time_dll])
fi fi
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS save_CXXFLAGS=$CXXFLAGS
...@@ -7972,7 +7949,6 @@ else ...@@ -7972,7 +7949,6 @@ else
BUILD_TYPE="$BUILD_TYPE BOOST" BUILD_TYPE="$BUILD_TYPE BOOST"
SYSTEM_BOOST=NO SYSTEM_BOOST=NO
fi fi
AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
AC_SUBST(SYSTEM_BOOST) AC_SUBST(SYSTEM_BOOST)
dnl =================================================================== dnl ===================================================================
...@@ -8135,13 +8111,13 @@ dnl Check for system NSS ...@@ -8135,13 +8111,13 @@ dnl Check for system NSS
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
if test "$with_system_nss" = "yes"; then if test "$with_system_nss" = "yes"; then
libo_MINGW_CHECK_DLL([NSPR4], [libnspr4]) libo_MINGW_CHECK_DLL([libnspr4])
libo_MINGW_CHECK_DLL([PLC4], [libplc4]) libo_MINGW_CHECK_DLL([libplc4])
libo_MINGW_CHECK_DLL([PLDS4], [libplds4]) libo_MINGW_CHECK_DLL([libplds4])
libo_MINGW_CHECK_DLL([NSS3], [nss3]) libo_MINGW_CHECK_DLL([nss3])
libo_MINGW_CHECK_DLL([NSSUTIL3], [nssutil3]) libo_MINGW_CHECK_DLL([nssutil3])
libo_MINGW_CHECK_DLL([SMIME3], [smime3]) libo_MINGW_CHECK_DLL([smime3])
libo_MINGW_CHECK_DLL([SSL3], [ssl3]) libo_MINGW_CHECK_DLL([ssl3])
else else
NSS_MAJOR="3" NSS_MAJOR="3"
NSS_MINOR="13" NSS_MINOR="13"
...@@ -8150,7 +8126,6 @@ fi ...@@ -8150,7 +8126,6 @@ fi
AC_SUBST(NSS_MAJOR) AC_SUBST(NSS_MAJOR)
AC_SUBST(NSS_MINOR) AC_SUBST(NSS_MINOR)
AC_SUBST(NSS_PATCH) AC_SUBST(NSS_PATCH)
AC_SUBST(MINGW_SMIME3_DLL)
dnl =================================================================== dnl ===================================================================
dnl Check for system mozilla headers dnl Check for system mozilla headers
...@@ -8312,9 +8287,9 @@ You can use --with-system-icu-for-build=force to use it anyway.]) ...@@ -8312,9 +8287,9 @@ You can use --with-system-icu-for-build=force to use it anyway.])
fi fi
fi fi
libo_MINGW_CHECK_DLL([ICUDATA], [icudata][$ICU_MAJOR][$ICU_MINOR]) libo_MINGW_CHECK_DLL([icudata][$ICU_MAJOR][$ICU_MINOR])
libo_MINGW_CHECK_DLL([ICUI18N], [icui18n][$ICU_MAJOR][$ICU_MINOR]) libo_MINGW_CHECK_DLL([icui18n][$ICU_MAJOR][$ICU_MINOR])
libo_MINGW_CHECK_DLL([ICUUC], [icuuc][$ICU_MAJOR][$ICU_MINOR]) libo_MINGW_CHECK_DLL([icuuc][$ICU_MAJOR][$ICU_MINOR])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_ICU="NO" SYSTEM_ICU="NO"
...@@ -8330,9 +8305,6 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS) ...@@ -8330,9 +8305,6 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER) AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)
AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER) AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER)
AC_SUBST([MINGW_ICUDATA_DLL])
AC_SUBST([MINGW_ICUI18N_DLL])
AC_SUBST([MINGW_ICUUC_DLL])
dnl =================================================================== dnl ===================================================================
dnl Graphite dnl Graphite
...@@ -8345,13 +8317,12 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o ...@@ -8345,13 +8317,12 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o
AC_DEFINE(ENABLE_GRAPHITE) AC_DEFINE(ENABLE_GRAPHITE)
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3]) libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
if test "$with_system_graphite" = "yes"; then if test "$with_system_graphite" = "yes"; then
libo_MINGW_CHECK_DLL([GRAPHITE2], [libgraphite2]) libo_MINGW_CHECK_DLL([libgraphite2])
fi fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_GRAPHITE) AC_SUBST(ENABLE_GRAPHITE)
AC_SUBST([MINGW_GRAPHITE2_DLL])
dnl =================================================================== dnl ===================================================================
dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents
...@@ -8505,16 +8476,13 @@ dnl =================================================================== ...@@ -8505,16 +8476,13 @@ dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.26.0]) libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.26.0])
if test "$with_system_neon" = "yes"; then if test "$with_system_neon" = "yes"; then
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
libo_MINGW_CHECK_DLL([NEON], [libneon]) libo_MINGW_CHECK_DLL([libneon])
libo_MINGW_TRY_DLL([TASN1], [libtasn1]) libo_MINGW_TRY_DLL([libtasn1])
libo_MINGW_TRY_DLL([GNUTLS], [libgnutls]) libo_MINGW_TRY_DLL([libgnutls])
else else
NEON_VERSION=0295 NEON_VERSION=0295
fi fi
AC_SUBST(NEON_VERSION) AC_SUBST(NEON_VERSION)
AC_SUBST([MINGW_GNUTLS_DLL])
AC_SUBST([MINGW_NEON_DLL])
AC_SUBST([MINGW_TASN1_DLL])
fi fi
dnl =================================================================== dnl ===================================================================
...@@ -8544,11 +8512,9 @@ else ...@@ -8544,11 +8512,9 @@ else
libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
fi fi
if test "$with_system_openssl" = "yes"; then if test "$with_system_openssl" = "yes"; then
libo_MINGW_CHECK_DLL([SSL], [libssl]) libo_MINGW_CHECK_DLL([libssl])
libo_MINGW_CHECK_DLL([CRYPTO], [libcrypto]) libo_MINGW_CHECK_DLL([libcrypto])
fi fi
AC_SUBST([MINGW_SSL_DLL])
AC_SUBST([MINGW_CRYPTO_DLL])
dnl =================================================================== dnl ===================================================================
dnl Check for system redland dnl Check for system redland
...@@ -8558,10 +8524,10 @@ libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland >= 1.0.8]) ...@@ -8558,10 +8524,10 @@ libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland >= 1.0.8])
if test "$with_system_redland" = "yes"; then if test "$with_system_redland" = "yes"; then
# need at least 2.0.7 for CVE-2012-0037 # need at least 2.0.7 for CVE-2012-0037
PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= 2.0.7]) PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= 2.0.7])
libo_MINGW_CHECK_DLL([REDLAND], [librdf]) libo_MINGW_CHECK_DLL([librdf])
libo_MINGW_TRY_DLL([RAPTOR], [libraptor]) libo_MINGW_TRY_DLL([libraptor])
libo_MINGW_TRY_DLL([RASQAL], [librasqal]) libo_MINGW_TRY_DLL([librasqal])
libo_MINGW_TRY_DLL([SQLITE3], [libsqlite3]) libo_MINGW_TRY_DLL([libsqlite3])
else else
RAPTOR_MAJOR="0" RAPTOR_MAJOR="0"
RASQAL_MAJOR="3" RASQAL_MAJOR="3"
...@@ -8570,10 +8536,6 @@ fi ...@@ -8570,10 +8536,6 @@ fi
AC_SUBST(RAPTOR_MAJOR) AC_SUBST(RAPTOR_MAJOR)
AC_SUBST(RASQAL_MAJOR) AC_SUBST(RASQAL_MAJOR)
AC_SUBST(REDLAND_MAJOR) AC_SUBST(REDLAND_MAJOR)
AC_SUBST([MINGW_RAPTOR_DLL])
AC_SUBST([MINGW_RASQAL_DLL])
AC_SUBST([MINGW_REDLAND_DLL])
AC_SUBST([MINGW_SQLITE3_DLL])
dnl =================================================================== dnl ===================================================================
dnl Check for system orcus dnl Check for system orcus
...@@ -8629,7 +8591,7 @@ if test "$with_system_hunspell" = "yes"; then ...@@ -8629,7 +8591,7 @@ if test "$with_system_hunspell" = "yes"; then
HUNSPELL_LIBS=-lhunspell HUNSPELL_LIBS=-lhunspell
fi fi
AC_LANG_POP([C++]) AC_LANG_POP([C++])
libo_MINGW_CHECK_DLL([HUNSPELL], [libhunspell-1.3]) libo_MINGW_CHECK_DLL([libhunspell-1.3])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO SYSTEM_HUNSPELL=NO
...@@ -8640,7 +8602,6 @@ fi ...@@ -8640,7 +8602,6 @@ fi
AC_SUBST(SYSTEM_HUNSPELL) AC_SUBST(SYSTEM_HUNSPELL)
AC_SUBST(HUNSPELL_CFLAGS) AC_SUBST(HUNSPELL_CFLAGS)
AC_SUBST(HUNSPELL_LIBS) AC_SUBST(HUNSPELL_LIBS)
AC_SUBST([MINGW_HUNSPELL_DLL])
dnl =================================================================== dnl ===================================================================
dnl Checking for altlinuxhyph dnl Checking for altlinuxhyph
...@@ -8664,7 +8625,7 @@ if test "$with_system_altlinuxhyph" = "yes"; then ...@@ -8664,7 +8625,7 @@ if test "$with_system_altlinuxhyph" = "yes"; then
AC_CHECK_LIB(hnj, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhnj], AC_CHECK_LIB(hnj, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhnj],
[ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], []) [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
fi fi
libo_MINGW_CHECK_DLL([HYPHEN], [libhyphen]) libo_MINGW_CHECK_DLL([libhyphen])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_HYPH=NO SYSTEM_HYPH=NO
...@@ -8672,7 +8633,6 @@ else ...@@ -8672,7 +8633,6 @@ else
fi fi
AC_SUBST(SYSTEM_HYPH) AC_SUBST(SYSTEM_HYPH)
AC_SUBST(HYPHEN_LIB) AC_SUBST(HYPHEN_LIB)
AC_SUBST([MINGW_HYPHEN_DLL])
dnl =================================================================== dnl ===================================================================
dnl Checking for mythes dnl Checking for mythes
...@@ -8697,7 +8657,7 @@ if test "$with_system_mythes" = "yes"; then ...@@ -8697,7 +8657,7 @@ if test "$with_system_mythes" = "yes"; then
fi fi
fi fi
AC_LANG_POP([C++]) AC_LANG_POP([C++])
libo_MINGW_CHECK_DLL([MYTHES], [libmythes-1.2]) libo_MINGW_CHECK_DLL([libmythes-1.2])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_MYTHES=NO SYSTEM_MYTHES=NO
...@@ -8706,7 +8666,6 @@ fi ...@@ -8706,7 +8666,6 @@ fi
AC_SUBST(SYSTEM_MYTHES) AC_SUBST(SYSTEM_MYTHES)
AC_SUBST(MYTHES_CFLAGS) AC_SUBST(MYTHES_CFLAGS)
AC_SUBST(MYTHES_LIBS) AC_SUBST(MYTHES_LIBS)
AC_SUBST([MINGW_MYTHES_DLL])
dnl =================================================================== dnl ===================================================================
dnl Checking for lpsolve dnl Checking for lpsolve
...@@ -8724,14 +8683,13 @@ if test "$with_system_lpsolve" = "yes"; then ...@@ -8724,14 +8683,13 @@ if test "$with_system_lpsolve" = "yes"; then
AC_CHECK_LIB([lpsolve55], [make_lp], [:], AC_CHECK_LIB([lpsolve55], [make_lp], [:],
[ AC_MSG_ERROR(lpsolve library not found or too old.)], []) [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
LIBS=$save_LIBS LIBS=$save_LIBS
libo_MINGW_CHECK_DLL([LPSOLVE], [lpsolve55]) libo_MINGW_CHECK_DLL([lpsolve55])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LPSOLVE=NO SYSTEM_LPSOLVE=NO
BUILD_TYPE="$BUILD_TYPE LPSOLVE" BUILD_TYPE="$BUILD_TYPE LPSOLVE"
fi fi
AC_SUBST(SYSTEM_LPSOLVE) AC_SUBST(SYSTEM_LPSOLVE)
AC_SUBST([MINGW_LPSOLVE_DLL])
...@@ -9570,7 +9528,7 @@ if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then ...@@ -9570,7 +9528,7 @@ if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then
CXXFLAGS=$save_CXXFLAGS CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++]) AC_LANG_POP([C++])
libo_MINGW_CHECK_DLL([POPPLER], [libpoppler]) libo_MINGW_CHECK_DLL([libpoppler])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO SYSTEM_POPPLER=NO
...@@ -9584,7 +9542,6 @@ AC_SUBST(ENABLE_PDFIMPORT) ...@@ -9584,7 +9542,6 @@ AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(SYSTEM_POPPLER) AC_SUBST(SYSTEM_POPPLER)
AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_CFLAGS)
AC_SUBST(POPPLER_LIBS) AC_SUBST(POPPLER_LIBS)
AC_SUBST([MINGW_POPPLER_DLL])
AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
...@@ -10893,11 +10850,11 @@ if test "$test_cairo" = "yes"; then ...@@ -10893,11 +10850,11 @@ if test "$test_cairo" = "yes"; then
AC_LANG_POP([C]) AC_LANG_POP([C])
fi fi
fi fi
libo_MINGW_CHECK_DLL([CAIRO], [libcairo]) libo_MINGW_CHECK_DLL([libcairo])
libo_MINGW_TRY_DLL([FONTCONFIG], [libfontconfig]) libo_MINGW_TRY_DLL([libfontconfig])
libo_MINGW_TRY_DLL([FREETYPE], [libfreetype]) libo_MINGW_TRY_DLL([libfreetype])
libo_MINGW_TRY_DLL([PIXMAN], [libpixman]) libo_MINGW_TRY_DLL([libpixman])
libo_MINGW_TRY_DLL([PNG15], [libpng15]) libo_MINGW_TRY_DLL([libpng15])
else else
SYSTEM_CAIRO=NO SYSTEM_CAIRO=NO
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
...@@ -10910,11 +10867,6 @@ fi ...@@ -10910,11 +10867,6 @@ fi
AC_SUBST(SYSTEM_CAIRO) AC_SUBST(SYSTEM_CAIRO)
AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_LIBS)
AC_SUBST([MINGW_CAIRO_DLL])
AC_SUBST([MINGW_FONTCONFIG_DLL])
AC_SUBST([MINGW_FREETYPE_DLL])
AC_SUBST([MINGW_PIXMAN_DLL])
AC_SUBST([MINGW_PNG15_DLL])
dnl =================================================================== dnl ===================================================================
dnl Test whether to use liblangtag dnl Test whether to use liblangtag
...@@ -10930,7 +10882,7 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != ...@@ -10930,7 +10882,7 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
SYSTEM_LIBLANGTAG=YES SYSTEM_LIBLANGTAG=YES
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0) PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag]) libo_MINGW_CHECK_DLL([liblangtag])
else else
SYSTEM_LIBLANGTAG=NO SYSTEM_LIBLANGTAG=NO
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
...@@ -10944,7 +10896,6 @@ AC_SUBST(ENABLE_LIBLANGTAG) ...@@ -10944,7 +10896,6 @@ AC_SUBST(ENABLE_LIBLANGTAG)
AC_SUBST(SYSTEM_LIBLANGTAG) AC_SUBST(SYSTEM_LIBLANGTAG)
AC_SUBST(LIBLANGTAG_CFLAGS) AC_SUBST(LIBLANGTAG_CFLAGS)
AC_SUBST(LIBLANGTAG_LIBS) AC_SUBST(LIBLANGTAG_LIBS)
AC_SUBST([MINGW_LIBLANGTAG_DLL])
dnl =================================================================== dnl ===================================================================
dnl Test whether to build libpng or rely on the system version dnl Test whether to build libpng or rely on the system version
......
external/Module_external.mk
Dosyayı görüntüle @ 19d263f0
...@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,external,\ ...@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,external,\
CustomTarget_wine \ CustomTarget_wine \
Package_jawt \ Package_jawt \
Package_mingw_dlls \ Package_mingw_dlls \
Package_mingw_gccdlls \
Package_wine \ Package_wine \
)) ))
endif endif
......
external/Package_mingw_dlls.mk
Dosyayı görüntüle @ 19d263f0
...@@ -9,61 +9,10 @@ ...@@ -9,61 +9,10 @@
$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) $(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTDIR)))
$(eval $(call gb_Package_add_files,mingw_dlls,bin,\ $(eval $(call gb_Package_add_files,mingw_dlls,bin,\
$(MINGW_BOOST_DATE_TIME_DLL) \ $(sort $(MINGW_DLLS)) \
$(MINGW_CAIRO_DLL) \
$(MINGW_CRYPTO_DLL) \
$(MINGW_CURL_DLL) \
$(MINGW_EXPAT_DLL) \
$(MINGW_FONTCONFIG_DLL) \
$(MINGW_FREETYPE_DLL) \
$(MINGW_GCRYPT_DLL) \
$(MINGW_GLIB_DLL) \
$(MINGW_GMODULE_DLL) \
$(MINGW_GNUTLS_DLL) \
$(MINGW_GPG_ERROR_DLL) \
$(MINGW_GRAPHITE2_DLL) \
$(MINGW_HUNSPELL_DLL) \
$(MINGW_HYPHEN_DLL) \
$(MINGW_ICONV_DLL) \
$(MINGW_ICUDATA_DLL) \
$(MINGW_ICUI18N_DLL) \
$(MINGW_ICUUC_DLL) \
$(MINGW_IDN_DLL) \
$(MINGW_INTL_DLL) \
$(MINGW_JPEG_DLL) \
$(MINGW_LCMS2_DLL) \
$(MINGW_LIBEXSLT_DLL) \
$(MINGW_LIBLANGTAG_DLL) \
$(MINGW_LIBXML_DLL) \
$(MINGW_LIBXSLT_DLL) \
$(MINGW_LPSOLVE_DLL) \
$(MINGW_MYTHES_DLL) \
$(MINGW_NEON_DLL) \
$(MINGW_NSPR4_DLL) \
$(MINGW_NSS3_DLL) \
$(MINGW_NSSUTIL3_DLL) \
$(MINGW_PIXMAN_DLL) \
$(MINGW_PYTHON_DLL) \
$(MINGW_PYTHON_EXE) \
$(MINGW_PLC4_DLL) \
$(MINGW_PLDS4_DLL) \
$(MINGW_PNG15_DLL) \
$(MINGW_POPPLER_DLL) \
$(MINGW_RAPTOR_DLL) \
$(MINGW_RASQAL_DLL) \
$(MINGW_READLINE_DLL) \
$(MINGW_REDLAND_DLL) \
$(MINGW_SQLITE3_DLL) \
$(MINGW_SMIME3_DLL) \
$(MINGW_SSH2_DLL) \
$(MINGW_SSL3_DLL) \
$(MINGW_SSL_DLL) \
$(MINGW_TASN1_DLL) \
$(MINGW_TERMCAP_DLL) \
$(MINGW_ZLIB_DLL) \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
)) ))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: # vim:set shiftwidth=4 tabstop=4 noexpandtab:
external/Package_mingw_gccdlls.mk 0 → 100644
Dosyayı görüntüle @ 19d263f0
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin))
$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
))
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
m4/mingw.m4
Dosyayı görüntüle @ 19d263f0
...@@ -24,10 +24,10 @@ dnl the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ...@@ -24,10 +24,10 @@ dnl the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
dnl in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable dnl in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
dnl instead of those above. dnl instead of those above.
# libo_MINGW_CHECK_DLL(variable-infix,dll-name-stem,[action-if-found],[action-if-not-found]) # libo_MINGW_CHECK_DLL(dll-name-stem,[action-if-found],[action-if-not-found])
# #
# Checks for presence of dll dll-name-stem . Sets variable # Checks for presence of dll dll-name-stem . Appends the dll name to
# MINGW_variable-infix_DLL if found, issues an error otherwise. # variable MINGW_DLLS if found, issues an error otherwise.
# #
# It recognizes these dll patterns (x, y match any character, but they # It recognizes these dll patterns (x, y match any character, but they
# are supposed to be numerals): # are supposed to be numerals):
...@@ -38,62 +38,63 @@ dnl instead of those above. ...@@ -38,62 +38,63 @@ dnl instead of those above.
# #
# #
# Example: # Example:
# libo_MINGW_CHECK_DLL([EXPAT], [libexpat]) # MINGW_DLLS=
# might result in MINGW_EXPAT_DLL=libexpat-1.dll being set. # libo_MINGW_CHECK_DLL([libexpat])
# might result in MINGW_DLLS containing libexpat-1.dll .
# #
# uses CC, WITH_MINGW # uses MINGW_SYSROOT, WITH_MINGW
# changes MINGW_DLLS
# ------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------
AC_DEFUN([libo_MINGW_CHECK_DLL], AC_DEFUN([libo_MINGW_CHECK_DLL],
[AC_ARG_VAR([MINGW_][$1][_DLL],[output variable containing the found dll name])dnl [dnl
if test -n "$WITH_MINGW"; then if test -n "$WITH_MINGW"; then
_libo_mingw_dlldir="[$MINGW_SYSROOT]"/bin _libo_mingw_dlldir="[$MINGW_SYSROOT]"/bin
_libo_mingw_dllname= _libo_mingw_dllname=
AC_MSG_CHECKING([for $2 dll]) AC_MSG_CHECKING([for $1 dll])
dnl try one- or two-numbered version dnl try one- or two-numbered version
_libo_mingw_try_dll([$2][-?.dll]) _libo_mingw_try_dll([$1][-?.dll])
if test "$_libo_mingw_dllname" = ""; then if test "$_libo_mingw_dllname" = ""; then
_libo_mingw_try_dll([$2][-??.dll]) _libo_mingw_try_dll([$1][-??.dll])
fi fi
dnl maybe the version contains a dot (e.g., libdb) dnl maybe the version contains a dot (e.g., libdb)
if test "$_libo_mingw_dllname" = ""; then if test "$_libo_mingw_dllname" = ""; then
_libo_mingw_try_dll([$2][-?.?.dll]) _libo_mingw_try_dll([$1][-?.?.dll])
fi fi
dnl maybe the version contains a dash (e.g., libpixman) dnl maybe the version contains a dash (e.g., libpixman)
if test "$_libo_mingw_dllname" = ""; then if test "$_libo_mingw_dllname" = ""; then
_libo_mingw_try_dll([$2][-?-?.dll]) _libo_mingw_try_dll([$1][-?-?.dll])
fi fi
dnl maybe it is not versioned dnl maybe it is not versioned
if test "$_libo_mingw_dllname" = ""; then if test "$_libo_mingw_dllname" = ""; then
_libo_mingw_try_dll([$2][.dll]) _libo_mingw_try_dll([$1][.dll])
fi fi
if test "$_libo_mingw_dllname" = ""; then if test "$_libo_mingw_dllname" = ""; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
m4_default([$4],[AC_MSG_ERROR([no dll found for $2])]) m4_default([$3],[AC_MSG_ERROR([no dll found for $1])])
else else
AC_MSG_RESULT([$_libo_mingw_dllname]) AC_MSG_RESULT([$_libo_mingw_dllname])
[MINGW_][$1][_DLL]="$_libo_mingw_dllname" MINGW_DLLS="$MINGW_DLLS $_libo_mingw_dllname"
m4_default([$3],[]) m4_default([$2],[])
fi fi
fi[]dnl fi[]dnl
]) # libo_MINGW_CHECK_DLL ]) # libo_MINGW_CHECK_DLL
# libo_MINGW_TRY_DLL(variable-infix,dll-name-stem) # libo_MINGW_TRY_DLL(dll-name-stem)
# #
# Checks for presence of dll dll-name-stem . Sets variable # Checks for presence of dll dll-name-stem . Appends the dll name to
# MINGW_variable-infix_DLL if found, does nothing otherwise. # variable MINGW_DLLS if found, does nothing otherwise.
# #
# See libo_MINGW_CHECK_DLL for further info. # See libo_MINGW_CHECK_DLL for further info.
# #
# uses CC, WITH_MINGW # uses MINGW_SYSROOT, WITH_MINGW
# changes MINGW_DLLS
# ------------------------------------------------ # ------------------------------------------------
AC_DEFUN([libo_MINGW_TRY_DLL], AC_DEFUN([libo_MINGW_TRY_DLL],
[dnl shortcut: do not test for already found dlls [dnl TODO: ignore already tested for dlls
if test -z "$[MINGW_][$1][_DLL]"; then libo_MINGW_CHECK_DLL([$1],[[]],[[]])dnl
libo_MINGW_CHECK_DLL([$1],[$2],[[]],[[]])
fi[]dnl
]) # libo_MINGW_TRY_DLL ]) # libo_MINGW_TRY_DLL
# _libo_mingw_try_dll(dll-name,dll-dir) # _libo_mingw_try_dll(dll-name,dll-dir)
......
scp2/InstallModule_ooo.mk
Dosyayı görüntüle @ 19d263f0
...@@ -97,55 +97,6 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ ...@@ -97,55 +97,6 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
MINGW_GXXDLL \ MINGW_GXXDLL \
)) ))
$(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_BOOST_DATE_TIME_DLL \
MINGW_CAIRO_DLL \
MINGW_CRYPTO_DLL \
MINGW_CURL_DLL \
MINGW_EXPAT_DLL \
MINGW_FONTCONFIG_DLL \
MINGW_FREETYPE_DLL \
MINGW_GCRYPT_DLL \
MINGW_GNUTLS_DLL \
MINGW_GPG_ERROR_DLL \
MINGW_GRAPHITE2_DLL \
MINGW_HUNSPELL_DLL \
MINGW_HYPHEN_DLL \
MINGW_ICONV_DLL \
MINGW_ICUDATA_DLL \
MINGW_ICUI18N_DLL \
MINGW_ICUUC_DLL \
MINGW_IDN_DLL \
MINGW_INTL_DLL \
MINGW_JPEG_DLL \
MINGW_LCMS2_DLL \
MINGW_LIBEXSLT_DLL \
MINGW_LIBLANGTAG_DLL \
MINGW_LIBXML_DLL \
MINGW_LIBXSLT_DLL \
MINGW_LPSOLVE_DLL \
MINGW_MYTHES_DLL \
MINGW_NEON_DLL \
MINGW_NSPR4_DLL \
MINGW_NSS3_DLL \
MINGW_NSSUTIL3_DLL \
MINGW_PIXMAN_DLL \
MINGW_PLC4_DLL \
MINGW_PLDS4_DLL \
MINGW_PNG15_DLL \
MINGW_POPPLER_DLL \
MINGW_RAPTOR_DLL \
MINGW_RASQAL_DLL \
MINGW_REDLAND_DLL \
MINGW_SMIME3_DLL \
MINGW_SQLITE3_DLL \
MINGW_SSH2_DLL \
MINGW_SSL3_DLL \
MINGW_SSL_DLL \
MINGW_TASN1_DLL \
MINGW_ZLIB_DLL \
))
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(WINDOWS_SDK_HOME),\ $(if $(WINDOWS_SDK_HOME),\
-DHAVE_WINDOWS_SDK \ -DHAVE_WINDOWS_SDK \
......
scp2/source/ooo/mingw_dlls.scp
Dosyayı görüntüle @ 19d263f0
...@@ -29,208 +29,12 @@ ...@@ -29,208 +29,12 @@
#if defined(WNT) && defined( _gcc3 ) #if defined(WNT) && defined( _gcc3 )
#define MINGW_DLL(id,name) \ File gid_Brand_File_Lib_Mingw_Dlls
File id \ TXT_FILE_BODY;
PACKED_LIB_FILE_BODY; \ Dir = FILELIST_DIR;
Dir = gid_Brand_Dir_Program; \ Name = "mingw_dlls.filelist";
Name = name; \ Styles = (FILELIST, PACKED);
Styles = (PACKED); \ End
End
#define MINGW_DLL_COND(cond,id,name) \
#ifdef SYSTEM_EXPAT
#ifdef NEEDS_MINGW_EXPAT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
#endif
#endif
#ifdef SYSTEM_LIBXSLT
#ifdef NEEDS_MINGW_LIBEXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )
#endif
#ifdef NEEDS_MINGW_LIBXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL )
#endif
#ifdef NEEDS_MINGW_ICONV_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Iconv, MINGW_ICONV_DLL )
#endif
#endif
#ifdef SYSTEM_LIBXML
#ifdef NEEDS_MINGW_ZLIB_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Zlib, MINGW_ZLIB_DLL )
#endif
#ifdef NEEDS_MINGW_LIBXML_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, MINGW_LIBXML_DLL )
#endif
#endif
#if defined SYSTEM_CURL || defined SYSTEM_NSS
#ifdef NEEDS_MINGW_NSPR4_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr, MINGW_NSPR4_DLL )
#endif
#ifdef NEEDS_MINGW_NSSUTIL3_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Nssutil, MINGW_NSSUTIL3_DLL )
#endif
#ifdef NEEDS_MINGW_PLC4_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplc, MINGW_PLC4_DLL )
#endif
#ifdef NEEDS_MINGW_PLDS4_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplds, MINGW_PLDS4_DLL )
#endif
#ifdef NEEDS_MINGW_NSS3_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_nss, MINGW_NSS3_DLL )
#endif
#ifdef NEEDS_MINGW_SSL3_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl, MINGW_SSL3_DLL )
#endif
#ifdef NEEDS_MINGW_SMIME3_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_smime, MINGW_SMIME3_DLL )
#endif
#endif
#ifdef SYSTEM_CURL
#ifdef NEEDS_MINGW_GPG_ERROR_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, MINGW_GPG_ERROR_DLL )
#endif
#ifdef NEEDS_MINGW_GCRYPT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt, MINGW_GCRYPT_DLL )
#endif
#ifdef NEEDS_MINGW_INTL_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl, MINGW_INTL_DLL )
#endif
#ifdef NEEDS_MINGW_IDN_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn, MINGW_IDN_DLL )
#endif
#ifdef NEEDS_MINGW_SSH2_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh, MINGW_SSH2_DLL )
#endif
#ifdef NEEDS_MINGW_CURL_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcurl, MINGW_CURL_DLL )
#endif
#endif
#ifdef SYSTEM_ICU
#ifdef NEEDS_MINGW_ICUI18N_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Icui18n, MINGW_ICUI18N_DLL )
#endif
#ifdef NEEDS_MINGW_ICUUC_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Icuuc, MINGW_ICUUC_DLL )
#endif
#ifdef NEEDS_MINGW_ICUDATA_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, MINGW_ICUDATA_DLL )
#endif
#endif
#ifdef SYSTEM_JPEG
#ifdef NEEDS_MINGW_JPEG_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Jpeg, MINGW_JPEG_DLL )
#endif
#endif
#ifdef SYSTEM_GRAPHITE
#ifdef NEEDS_MINGW_GRAPHITE2_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )
#endif
#endif
#ifdef SYSTEM_NEON
#ifdef NEEDS_MINGW_TASN1_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn, MINGW_TASN1_DLL )
#endif
#ifdef NEEDS_MINGW_GNUTLS_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgnutls, MINGW_GNUTLS_DLL )
#endif
#ifdef NEEDS_MINGW_NEON_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libneon, MINGW_NEON_DLL )
#endif
#endif
#ifdef SYSTEM_OPENSSL
#ifdef NEEDS_MINGW_SSL_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssl, MINGW_SSL_DLL )
#endif
#ifdef NEEDS_MINGW_CRYPTO_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcrypto, MINGW_CRYPTO_DLL )
#endif
#endif
#ifdef SYSTEM_REDLAND
#ifdef NEEDS_MINGW_RAPTOR_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libraptor, MINGW_RAPTOR_DLL )
#endif
#ifdef NEEDS_MINGW_RASQAL_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Librasqal, MINGW_RASQAL_DLL )
#endif
#ifdef NEEDS_MINGW_SQLITE3_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libqslite, MINGW_SQLITE3_DLL )
#endif
#ifdef NEEDS_MINGW_REDLAND_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Librdf, MINGW_REDLAND_DLL )
#endif
#endif
#ifdef SYSTEM_HUNSPELL
#ifdef NEEDS_MINGW_HUNSPELL_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhunspell, MINGW_HUNSPELL_DLL )
#endif
#endif
#ifdef SYSTEM_HYPH
#ifdef NEEDS_MINGW_HYPHEN_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhyphen, MINGW_HYPHEN_DLL )
#endif
#endif
#ifdef SYSTEM_MYTHES
#ifdef NEEDS_MINGW_MYTHES_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libmythes, MINGW_MYTHES_DLL )
#endif
#endif
#ifdef SYSTEM_LPSOLVE
#ifdef NEEDS_MINGW_LPSOLVE_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Lpsolve, MINGW_LPSOLVE_DLL )
#endif
#endif
#ifdef SYSTEM_CAIRO
#ifdef NEEDS_MINGW_FONTCONFIG_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfontconfig, MINGW_FONTCONFIG_DLL )
#endif
#ifdef NEEDS_MINGW_FREETYPE_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfreetype, MINGW_FREETYPE_DLL )
#endif
#ifdef NEEDS_MINGW_PIXMAN_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpixman, MINGW_PIXMAN_DLL )
#endif
#ifdef NEEDS_MINGW_PNG15_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpng, MINGW_PNG15_DLL )
#endif
#ifdef NEEDS_MINGW_CAIRO_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcairo, MINGW_CAIRO_DLL )
#endif
#endif
#ifdef SYSTEM_LCMS2
#ifdef NEEDS_MINGW_LCMS2_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblcms2, MINGW_LCMS2_DLL )
#endif
#endif
#if defined SYSTEM_BOOST
#if defined NEEDS_MINGW_BOOST_DATE_TIME_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DLL )
#endif
#endif
#ifdef SYSTEM_POPPLER
#ifdef NEEDS_MINGW_POPPLER_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpoppler, MINGW_POPPLER_DLL )
#endif
#endif
#if defined(MINGW_GCCDLL) #if defined(MINGW_GCCDLL)
......
solenv/gbuild/InstallModule.mk
Dosyayı görüntüle @ 19d263f0
...@@ -70,11 +70,6 @@ $(call gb_InstallModuleTarget_define_value_if_set,$(1),$(2)) ...@@ -70,11 +70,6 @@ $(call gb_InstallModuleTarget_define_value_if_set,$(1),$(2))
endef endef
define gb_InstallModule_define_mingw_dll_if_set
$(call gb_InstallModuleTarget_define_mingw_dll_if_set,$(1),$(2))
endef
define gb_InstallModule_add_scpfile define gb_InstallModule_add_scpfile
$(call gb_InstallModuleTarget_add_scpfile,$(1),$(2)) $(call gb_InstallModuleTarget_add_scpfile,$(1),$(2))
......
solenv/gbuild/InstallModuleTarget.mk
Dosyayı görüntüle @ 19d263f0
...@@ -273,13 +273,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ ...@@ -273,13 +273,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
endef endef
define gb_InstallModuleTarget_define_mingw_dll_if_set
$(call gb_InstallModuleTarget_add_defs,$(1),\
$(foreach def,$(2),$(if $($(def)),-DNEEDS_$(def) -D$(def)=\""$($(def))"\")) \
)
endef
define gb_InstallModuleTarget_use_auto_install_libs define gb_InstallModuleTarget_use_auto_install_libs
$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstallLibs_get_target,$(2)) $(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstallLibs_get_target,$(2))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment