Kaydet (Commit) c1239a1e authored tarafından Caolán McNamara's avatar Caolán McNamara

default unix in general to system libxml2/libxslt like MacOSX

Change-Id: I7cde2a79462c71f4ce6e3ab75152e804ec7260f9
üst f0997ea3
lcairo cairo : ZLIB:zlib libpng soltools NULL lcairo cairo : ZLIB:zlib LIBPNG:libpng soltools NULL
lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL
...@@ -1155,11 +1155,7 @@ AC_ARG_WITH(external-thes-dir, ...@@ -1155,11 +1155,7 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-zlib, AC_ARG_WITH(system-zlib,
AS_HELP_STRING([--with-system-zlib], AS_HELP_STRING([--with-system-zlib],
[Use zlib already on system.]),, [Use zlib already on system.]),,
[if test "$_os" != "WINNT"; then [with_system_zlib=auto])
with_system_zlib=yes
else
with_system_zlib="$with_system_libs"
fi])
AC_ARG_WITH(system-openssl, AC_ARG_WITH(system-openssl,
AS_HELP_STRING([--with-system-openssl], AS_HELP_STRING([--with-system-openssl],
...@@ -1169,11 +1165,7 @@ AC_ARG_WITH(system-openssl, ...@@ -1169,11 +1165,7 @@ AC_ARG_WITH(system-openssl,
AC_ARG_WITH(system-jpeg, AC_ARG_WITH(system-jpeg,
AS_HELP_STRING([--with-system-jpeg], AS_HELP_STRING([--with-system-jpeg],
[Use jpeg already on system.]),, [Use jpeg already on system.]),,
[if test "$_os" = "Linux"; then [with_system_jpeg=auto])
with_system_jpeg=yes
else
with_system_jpeg="$with_system_libs"
fi])
AC_ARG_WITH(system-clucene, AC_ARG_WITH(system-clucene,
AS_HELP_STRING([--with-system-clucene], AS_HELP_STRING([--with-system-clucene],
...@@ -1223,11 +1215,7 @@ AC_ARG_WITH(system-libwpg, ...@@ -1223,11 +1215,7 @@ AC_ARG_WITH(system-libwpg,
AC_ARG_WITH(system-libxml, AC_ARG_WITH(system-libxml,
AS_HELP_STRING([--with-system-libxml], AS_HELP_STRING([--with-system-libxml],
[Use libxml/libxslt already on system.]),, [Use libxml/libxslt already on system.]),,
[if test "$_os" = "Darwin"; then [with_system_libxml=auto])
with_system_libxml=yes
else
with_system_libxml="$with_system_libs"
fi])
AC_ARG_WITH(system-icu, AC_ARG_WITH(system-icu,
AS_HELP_STRING([--with-system-icu], AS_HELP_STRING([--with-system-icu],
...@@ -1450,11 +1438,7 @@ AC_ARG_WITH(system-mesa-headers, ...@@ -1450,11 +1438,7 @@ AC_ARG_WITH(system-mesa-headers,
AC_ARG_WITH(system-curl, AC_ARG_WITH(system-curl,
AS_HELP_STRING([--with-system-curl], AS_HELP_STRING([--with-system-curl],
[Use curl already on system.]),, [Use curl already on system.]),,
[if test "$_os" = "Darwin"; then [with_system_curl=auto])
with_system_curl=yes
else
with_system_curl="$with_system_libs"
fi])
AC_ARG_WITH(system-boost, AC_ARG_WITH(system-boost,
AS_HELP_STRING([--with-system-boost], AS_HELP_STRING([--with-system-boost],
...@@ -1535,7 +1519,7 @@ AC_ARG_WITH(system-gettext, ...@@ -1535,7 +1519,7 @@ AC_ARG_WITH(system-gettext,
AC_ARG_WITH(system-libpng, AC_ARG_WITH(system-libpng,
AS_HELP_STRING([--with-system-libpng], AS_HELP_STRING([--with-system-libpng],
[Use libpng already on system.]),, [Use libpng already on system.]),,
[with_system_libpng="$with_system_libs"]) [with_system_libpng=auto])
AC_ARG_WITH(linker-hash-style, AC_ARG_WITH(linker-hash-style,
AS_HELP_STRING([--with-linker-hash-style], AS_HELP_STRING([--with-linker-hash-style],
...@@ -6039,6 +6023,17 @@ AC_SUBST(SYSTEM_STDLIBS) ...@@ -6039,6 +6023,17 @@ AC_SUBST(SYSTEM_STDLIBS)
dnl =================================================================== dnl ===================================================================
dnl Check for system zlib dnl Check for system zlib
dnl =================================================================== dnl ===================================================================
if test "$with_system_zlib" = "auto"; then
case "$_os" in
WINNT)
with_system_zlib="$with_system_libs"
;;
*)
with_system_zlib=yes
;;
esac
fi
AC_MSG_CHECKING([which zlib to use]) AC_MSG_CHECKING([which zlib to use])
if test "$with_system_zlib" = "yes"; then if test "$with_system_zlib" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
...@@ -6067,6 +6062,17 @@ dnl =================================================================== ...@@ -6067,6 +6062,17 @@ dnl ===================================================================
dnl Check for system jpeg dnl Check for system jpeg
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([which jpeg to use]) AC_MSG_CHECKING([which jpeg to use])
if test "$with_system_jpeg" = "auto"; then
case "$_os" in
WINNT|Darwin|iOS|Android)
with_system_jpeg="$with_system_libs"
;;
*)
with_system_jpeg=yes
;;
esac
fi
if test "$with_system_jpeg" = "yes"; then if test "$with_system_jpeg" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_JPEG=YES SYSTEM_JPEG=YES
...@@ -6325,6 +6331,17 @@ AC_SUBST(USE_FT_EMBOLDEN) ...@@ -6325,6 +6331,17 @@ AC_SUBST(USE_FT_EMBOLDEN)
# to prevent incompatibilities between internal libxml2 and external libxslt, # to prevent incompatibilities between internal libxml2 and external libxslt,
# or vice versa, use with_system_libxml here # or vice versa, use with_system_libxml here
# =================================================================== # ===================================================================
if test "$with_system_libxml" = "auto"; then
case "$_os" in
WINNT|iOS|Android)
with_system_libxml="$with_system_libs"
;;
*)
with_system_libxml=yes
;;
esac
fi
AC_MSG_CHECKING([which libxslt to use]) AC_MSG_CHECKING([which libxslt to use])
if test "$with_system_libxml" = "yes"; then if test "$with_system_libxml" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
...@@ -7075,6 +7092,17 @@ dnl =================================================================== ...@@ -7075,6 +7092,17 @@ dnl ===================================================================
dnl Check for system curl dnl Check for system curl
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([which libcurl to use]) AC_MSG_CHECKING([which libcurl to use])
if test "$with_system_curl" = "auto"; then
case "$_os" in
Darwin)
with_system_curl=yes
;;
*)
with_system_curl="$with_system_libs"
;;
esac
fi
if test "$with_system_curl" = "yes"; then if test "$with_system_curl" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_CURL=YES SYSTEM_CURL=YES
...@@ -10627,21 +10655,25 @@ dnl How should and does this interact with the checks for libpng ...@@ -10627,21 +10655,25 @@ dnl How should and does this interact with the checks for libpng
dnl related to use of libpng in the quickstarter above? This needs to dnl related to use of libpng in the quickstarter above? This needs to
dnl be unified. dnl be unified.
if test "$with_system_libpng" = yes; then if test "$with_system_libpng" = "auto"; then
SYSTEM_LIBPNG=YES
AC_MSG_RESULT([yes])
else
case "$_os" in case "$_os" in
WINNT|Darwin|iOS|Android) WINNT|Darwin|iOS|Android)
SYSTEM_LIBPNG=NO with_system_libpng="$with_system_libs"
AC_MSG_RESULT([no])
;; ;;
*) *)
SYSTEM_LIBPNG=YES with_system_libpng=yes
AC_MSG_RESULT([yes])
;; ;;
esac esac
fi fi
if test "$with_system_libpng" = yes; then
SYSTEM_LIBPNG=YES
AC_MSG_RESULT([yes])
else
SYSTEM_LIBPNG=NO
BUILD_TYPE="$BUILD_TYPE LIBPNG"
AC_MSG_RESULT([no])
fi
AC_SUBST(SYSTEM_LIBPNG) AC_SUBST(SYSTEM_LIBPNG)
dnl =================================================================== dnl ===================================================================
......
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