mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hardcode libxslt & libxml cflags/lib for use with the Mac SDK

Browse Source 
also remove the then unused PKG_CHECK_MODULES_MACHACK wrapper
This commit is contained in:
Christian Lohmaier
2011-06-03 16:57:56 +02:00
parent df78129375
commit 9a7226ff13
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acinclude.m4
View File

@@ -118,21 +118,3 @@ esac
AC_LANG_POP(C) AC_LANG_POP(C)
]) dnl end AC_DEFUN ]) dnl end AC_DEFUN
dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra
dnl argument between the first and second, denoting a program to call instead of
dnl pkg-config on Mac OS X (aka Darwin):
AC_DEFUN([PKG_CHECK_MODULES_MACHACK],
[if test "$_os" = "Darwin"; then
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$2 --cflags`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$2 --libs`
AC_MSG_RESULT($$1_LIBS)
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
PKG_CHECK_MODULES($1, $3, $4, $5, $6)
fi
])

63
configure.in
View File

@@ -4305,50 +4305,63 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
fi fi
fi fi
dnl =================================================================== # ===================================================================
dnl Check for system libxslt # Check for system libxslt
dnl =================================================================== # ===================================================================
AC_MSG_CHECKING([which libxslt to use]) AC_MSG_CHECKING([which libxslt to use])
if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \ if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
"$_os" = "Darwin" && \ "$_os" = "Darwin" && \
test "$with_system_libxslt" != "no"; then test "$with_system_libxslt" != "no"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_LIBXSLT=YES SYSTEM_LIBXSLT=YES
if test "$_os" = "Darwin"; then
dnl make sure to use SDK path
LIBXSLT_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
dnl omit -L/usr/lib
LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm"
else
PKG_CHECK_MODULES(LIBXSLT, xslt-config, libxslt)
fi
PKG_CHECK_MODULES_MACHACK(LIBXSLT, xslt-config, libxslt) dnl Check for xsltproc
AC_PATH_PROG(XSLTPROC, xsltproc, no)
dnl Check for xsltproc if test "$XSLTPROC" = "no"; then
AC_PATH_PROG(XSLTPROC, xsltproc, no) AC_MSG_ERROR([xsltproc is required])
if test "$XSLTPROC" = "no"; then fi
AC_MSG_ERROR([xsltproc is required])
fi
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO SYSTEM_LIBXSLT=NO
BUILD_TYPE="$BUILD_TYPE LIBXSLT" BUILD_TYPE="$BUILD_TYPE LIBXSLT"
if test "$cross_compiling" = "yes"; then if test "$cross_compiling" = "yes"; then
AC_PATH_PROG(XSLTPROC, xsltproc, no) AC_PATH_PROG(XSLTPROC, xsltproc, no)
if test "$XSLTPROC" = "no"; then if test "$XSLTPROC" = "no"; then
AC_MSG_ERROR([xsltproc is required]) AC_MSG_ERROR([xsltproc is required])
fi fi
fi fi
fi fi
AC_SUBST(SYSTEM_LIBXSLT) AC_SUBST(SYSTEM_LIBXSLT)
AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS) AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(XSLTPROC) AC_SUBST(XSLTPROC)
dnl =================================================================== # ===================================================================
dnl Check for system libxml # Check for system libxml
dnl =================================================================== # ===================================================================
AC_MSG_CHECKING([which libxml to use]) AC_MSG_CHECKING([which libxml to use])
if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
"$_os" = "Darwin" && \ "$_os" = "Darwin" && \
test "$with_system_libxml" != "no"; then test "$with_system_libxml" != "no"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_LIBXML=YES SYSTEM_LIBXML=YES
PKG_CHECK_MODULES_MACHACK(LIBXML, xml2-config, libxml-2.0 >= 2.0) if test "$_os" = "Darwin"; then
dnl make sure to use SDK path
LIBXML_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
dnl omit -L/usr/lib
LIBXML_LIBS="-lxml2 -lz -lpthread -liconv -lm"
else
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
fi
BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])