get rid of PKG_CHECK_MODULES_MACHACK

acinclude.m4

-dnl @synopsis PKG_CHECK_MODULES_MACHACK
-
-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
-])

configure.in

@@ -3925,7 +3925,12 @@ if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
    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 "$with_system_libs" -o \
 	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