svn commit: r1303459 - in /incubator/ooo/trunk/main: acinclude.m4 aclocal.m4 configure.in

[hd...@apache.org]

Author: hdu
Date: Wed Mar 21 16:21:20 2012
New Revision: 1303459

URL: http://svn.apache.org/viewvc?rev=1303459&view=rev
Log:
get rid of PKG_CHECK_MODULES_MACHACK

Removed:
    incubator/ooo/trunk/main/acinclude.m4
Modified:
    incubator/ooo/trunk/main/aclocal.m4
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/aclocal.m4
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/aclocal.m4?rev=1303459&r1=1303458&r2=1303459&view=diff
==============================================================================
--- incubator/ooo/trunk/main/aclocal.m4 (original)
+++ incubator/ooo/trunk/main/aclocal.m4 Wed Mar 21 16:21:20 2012
@@ -393,4 +393,3 @@ AC_DEFUN([AM_RUN_LOG],
    echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    (exit $ac_status); }])
 
-m4_include([acinclude.m4])

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1303459&r1=1303458&r2=1303459&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Mar 21 16:21:20 2012
@@ -3925,7 +3925,12 @@ if test -n "$with_system_libxslt" -o -n 
    AC_MSG_RESULT([external])
    SYSTEM_LIBXSLT=YES
 
-   PKG_CHECK_MODULES_MACHACK(LIBXSLT, xslt-config, libxslt)
+	if test "$_os" != "Darwin"; then
+		PKG_CHECK_MODULES(LIBXSLT, libxslt)
+	else
+		LIBXSLT_CFLAGS=`xslt-config --cflags`
+		LIBXSLT_LDLAGS=`xslt-config --libs`
+	fi
 
    dnl Check for xsltproc
    AC_PATH_PROG(XSLTPROC, xsltproc, no)
@@ -3951,8 +3956,14 @@ if test -n "$with_system_libxml" -o -n "
 	test "$with_system_libxml" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBXML=YES
-    PKG_CHECK_MODULES_MACHACK(LIBXML, xml2-config, libxml-2.0 >= 2.0)
     BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
+
+	if test "$_os" != "Darwin"; then
+		PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
+	else
+		LIBXML_CFLAGS=`xml2-config --cflags`
+		LIBXML_LDLAGS=`xml2-config --libs`
+	fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBXML=NO