swfmill 0.0.1 → 0.0.2

data/ext/extconf.rb

@@ -1,25 +1,71 @@
 require "mkmf"
 
+def arg_include_exist?(target)
+  !!(arg_config("--with-#{target}-include") || arg_config("--with-#{target}-dir"))
+end
+
+def arg_include(target)
+  arg_config("--with-#{target}-include", arg_config("--with-#{target}-dir", "/usr") + "/include")
+end
+
+def arg_lib_exist?(target)
+  !!(arg_config("--with-#{target}-lib") || arg_config("--with-#{target}-dir"))
+end
+
+def arg_lib(target)
+  arg_config("--with-#{target}-lib", arg_config("--with-#{target}-dir", "/usr") + "/lib")
+end
+
 dir_config("freetype")
-$FREETYPE_CFLAGS = "-I" + File.join(arg_config("--with-freetype-include", arg_config("--with-freetype-dir", "/usr/include")), "freetype2")
-$FREETYPE_LIBS   = "-L" + arg_config("--with-freetype-lib", "/usr/lib") + " -lfreetype"
-$CFLAGS  += " " + $FREETYPE_CFLAGS
+if arg_include_exist?("freetype")
+  $FREETYPE_CFLAGS = "-I#{arg_include("freetype") + "/freetype2"}"
+  $CFLAGS += " #{$FREETYPE_CFLAGS}"
+end
+if arg_lib_exist?("freetype")
+  $FREETYPE_LIBS = "-L#{arg_lib("freetype")} -lfreetype"
+  $LDFLAGS += " -L#{arg_lib("freetype")}"
+  $libs += " -lfreetype"
+end
+unless $FREETYPE_CFLAGS and $FREETYPE_LIBS
+  $FREETYPE_CFLAGS, ldflags, libs = pkg_config("freetype2")
+  $FREETYPE_LIBS = "#{ldflags} #{libs}"
+end
 have_library("freetype")
 have_header("ft2build.h")
 
 dir_config("libxml2")
-$XML_CFLAGS = "-I" + File.join(arg_config("--with-libxml2-include", arg_config("--with-libxml2-dir", "/usr/include")), "libxml2")
-$XML_LIBS   = "-L" + arg_config("--with-libxml2-lib", "/usr/lib") + " -lxml2"
-$CFLAGS  += " " + $XML_CFLAGS
+if arg_include_exist?("libxml2")
+  $XML_CFLAGS = "-I#{arg_include("libxml2") + "/libxml2"}"
+  $CFLAGS += " #{$XML_CFLAGS}"
+end
+if arg_lib_exist?("libxml2")
+  $XML_LIBS = "-L#{arg_lib("libxml2")} -lxml2"
+  $LDFLAGS += " -L#{arg_lib("libxml2")}"
+  $libs += " -lxml2"
+end
+unless $XML_CFLAGS and $XML_LIBS
+  $XML_CFLAGS, ldflags, libs = pkg_config("libxml-2.0")
+  $XML_LIBS = "#{ldflags} #{libs}"
+end
 have_library("xml2")
 have_header("libxml/tree.h")
 have_header("libxml/uri.h")
 have_header("libxml/xpathInternals.h")
 
-dir_config("libxslt")
-$XSLT_CFLAGS = "-I" + File.join(arg_config("--with-libxslt-include", arg_config("--with-libxslt-dir", "/usr/include")), "libxml2")
-$XSLT_LIBS   = "-L" + arg_config("--with-libxslt-lib", "/usr/lib") + " -lexslt -lxslt"
-$CFLAGS  += " " + $XSLT_CFLAGS
+dir_config("libexslt")
+if arg_include_exist?("libexslt")
+  $XSLT_CFLAGS = "-I#{arg_include("libexslt") + "/libxml2"}"
+  $CFLAGS += " #{XSLT_CFLAGS}"
+end
+if arg_lib_exist?("libexslt")
+  $XSLT_LIBS = "-L#{arg_lib("libexslt")} -lexslt -lxslt -lxml2"
+  $LDFLAGS += " -L#{arg_lib("libexslt")}"
+  $libs += " -lexslt -lxslt -lxml2"
+end
+unless $XSLT_CFLAGS and $XSLT_LIBS
+  $XSLT_CFLAGS, ldflags, libs = pkg_config("libexslt")
+  $XSLT_LIBS = "#{ldflags} #{libs}"
+end
 have_library("exslt")
 have_library("xslt")
 have_header("libexslt/exslt.h")
@@ -29,58 +75,46 @@ have_header("libxslt/variables.h")
 have_header("libxslt/xsltutils.h")
 
 dir_config("libpng")
-$PNG_CFLAGS = "-I" + File.join(arg_config("--with-libpng-include", arg_config("--with-libpng-dir", "/usr/include")))
-$PNG_LIBS   = "-L" + arg_config("--with-libpng-lib", "/usr/lib") + " -lpng"
-$CFLAGS  += " " + $PNG_CFLAGS
+if arg_include_exist?("libpng")
+  $PNG_CFLAGS = "-I#{arg_include("libpng")}"
+  $CFLAGS += " #{$PNG_CFLAGS}"
+end
+if arg_lib_exist?("libpng")
+  $PNG_LIBS = "-L#{arg_lib("libpng")} -lpng"
+  $LDFLAGS += " -L#{arg_lib("libpng")}"
+  $libs += " -lpng"
+end
+unless $PNG_CFLAGS and $PNG_LIBS
+  $PNG_CFLAGS, ldflags, libs = pkg_config("libpng")
+  $PNG_LIBS = "#{ldflags} #{libs}"
+end
 have_library("png")
 have_header("png.h")
 
 dir_config("zlib")
 have_header("zlib.h")
 
+have_func("iconv", "iconv.h") or have_library("iconv", "iconv", "iconv.h")
+
 have_library("stdc++")
 
 $CFLAGS  += " -I./swfmill/src -I./swfmill/src/swft -I./swfmill/src/xslt"
-$LDFLAGS += " -L./swfmill/src/swft/.libs -lswft -L./swfmill/src/xslt/.libs -lswfmillxslt"
-
-create_makefile("swfmill_ext")
 
 Dir.chdir("swfmill") do
-  cmd = "sh autogen.sh"
-  raise "error: #{cmd}" unless system(cmd)
   cmd = <<CMD
-sh configure --disable-dependency-tracking \
+sh configure --config-cache --disable-dependency-tracking \
 FREETYPE_CFLAGS="#{$FREETYPE_CFLAGS}" FREETYPE_LIBS="#{$FREETYPE_LIBS}" \
 XML_CFLAGS="#{$XML_CFLAGS}" XML_LIBS="#{$XML_LIBS}" \
 XSLT_CFLAGS="#{$XSLT_CFLAGS}" XSLT_LIBS="#{$XSLT_LIBS}" \
-PNG_CFLAGS="#{$PNG_CFLAGS}" PNG_LIBS="#{$PNG_LIBS}"
+PNG_CFLAGS="#{$PNG_CFLAGS}" PNG_LIBS="#{$PNG_LIBS}" \
+CXXFLAGS="-O3"
 CMD
   raise "error: #{cmd}" unless system(cmd)
   cmd = "make"
   raise "error: #{cmd}" unless system(cmd)
 end
 
-objs_prefix = "swfmill/src/"
-append_objs = ["swfmill-Geom.o",
-               "swfmill-SWFAction.o",
-               "swfmill-SWFFile.o",
-               "swfmill-SWFFilter.o",
-               "swfmill-SWFGlyphList.o",
-               "swfmill-SWFItem.o",
-               "swfmill-SWFReader.o",
-               "swfmill-SWFShapeItem.o",
-               "swfmill-SWFShapeMaker.o",
-               "swfmill-SWFTag.o",
-               "swfmill-SWFTrait.o",
-               "swfmill-SWFWriter.o",
-               "swfmill-base64.o",
-               "swfmill-gSWFBasics.o",
-               "swfmill-gSWFDumper.o",
-               "swfmill-gSWFParseXML.o",
-               "swfmill-gSWFParser.o",
-               "swfmill-gSWFSize.o",
-               "swfmill-gSWFWriteXML.o",
-               "swfmill-gSWFWriter.o",]
-File.open(File.dirname(__FILE__) + "/Makefile", "ab") do |f|
-  f.puts "OBJS += " + append_objs.map{ |e| objs_prefix + e }.join(" ")
+create_makefile("swfmill_ext")
+File.open(File.dirname("__FILE__") + "/Makefile", "ab") do |f|
+  f.puts "OBJS += #{Dir["swfmill/src/**/*.o"].join(" ")}"
 end

data/ext/inflate.h

@@ -0,0 +1,82 @@
+#ifndef _INFLATE_H_
+#define _INFLATE_H_
+#include <zlib.h>
+
+class Inflate
+{
+public:
+
+    Inflate(const unsigned char* data, const size_t size, const size_t length)
+        : _initialized(false)
+    {
+        _data = const_cast<unsigned char*>(data);
+        _data_size = size;
+        _buff = new Bytef[length];
+        _buff_size = length;
+    }
+
+    ~Inflate()
+    {
+        finish();
+        delete[] _buff;
+    }
+
+    bool decompress()
+    {
+        if(!init())
+        {
+            return false;
+        }
+
+        int status;
+        status = inflate(&stream, Z_FINISH);
+        return status == Z_STREAM_END;
+    }
+
+    const char* error() const
+    {
+        return stream.msg;
+    }
+
+    const Bytef* data() const
+    {
+        return _buff;
+    }
+
+private:
+
+    bool init()
+    {
+        if(_initialized)
+        {
+            return true;
+        }
+        stream.zalloc    = Z_NULL;
+        stream.zfree     = Z_NULL;
+        stream.opaque    = Z_NULL;
+        stream.next_in   = _data;
+        stream.avail_in  = _data_size;
+        stream.next_out  = _buff;
+        stream.avail_out = _buff_size;
+        return _initialized = inflateInit(&stream) == Z_OK;
+    }
+
+    bool finish()
+    {
+        if(_initialized)
+        {
+            return inflateEnd(&stream) == Z_OK;
+        }
+        return false;
+    }
+
+    z_stream      stream;
+    unsigned char* _data;
+    Bytef*         _buff;
+    size_t    _data_size;
+    size_t    _buff_size;
+    bool    _initialized;
+
+};
+
+#endif /* _INFLATE_H_ */

data/ext/swfmill/.gitignore

@@ -1,16 +1,7 @@
-Makefile
-
-*.la
-*.lo
-*.o
-
-libtool
 config.cache
 config.log
 config.status
-
-src/.deps
-src/.libs
+libtool
 src/gSWFBasics.cpp
 src/gSWFDumper.cpp
 src/gSWFParseXML.cpp
@@ -19,9 +10,5 @@ src/gSWFSize.cpp
 src/gSWFWriteXML.cpp
 src/gSWFWriter.cpp
 src/swfmill
-
-src/swft/.deps
-src/swft/.libs
-
-src/xslt/.deps
-src/xslt/.libs
+src/xslt/simple.cpp
+src/xslt/simple.xsl

data/ext/swfmill/AUTHORS

@@ -6,4 +6,5 @@ It is maintained by Daniel Cassidy <mail@danielcassidy.me.uk>.
 Contributors (in chronological order):
 Herman Narkaytis, Steve Webster, Juan José Silveira, Gerrit Karius,
 Kazuaki MATSUHASHI, Lars Bonde, Alex Midgley, Jey, Ralf Fuest, INADA Naoki,
-Arthur Chan, Paul Colomiets, Robin Palotai, Benjamin Wolsey, MURAOKA Daisuke.
+Arthur Chan, Paul Colomiets, Robin Palotai, Benjamin Wolsey, MURAOKA Daisuke,
+Piers Haken.

data/ext/swfmill/Makefile.in

@@ -95,12 +95,13 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXSLT_CFLAGS = @EXSLT_CFLAGS@
+EXSLT_LIBS = @EXSLT_LIBS@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GREP = @GREP@
-HAVE_PKGCONFIG = @HAVE_PKGCONFIG@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

data/ext/swfmill/NEWS

@@ -1,3 +1,8 @@
+    Simple dialect: Automatically detect the number of frames (previously
+        it was necessary to specify the number of frames in the <movie> tag).
+    Fix occasional incorrect JPEG dimensions (thanks to Piers Haken).
+    Support alternate text encodings in SWF 5 and earlier.
+
 2009-11-29 release 0.3.0
     Fix compile error with GCC 4.4 due to inconsistent constancy
     Support for colormap in DefineBitsLossless (thanks to MURAOKA Daisuke)

data/ext/swfmill/autogen.sh

@@ -1,7 +1,13 @@
 #!/bin/sh
 
+if which glibtoolize; then
+	LIBTOOLIZE=glibtoolize
+else
+	LIBTOOLIZE=libtoolize
+fi
+
 set -x
 aclocal -I autoconfig/m4
-libtoolize --force --copy
+$LIBTOOLIZE --force --copy
 automake --foreign --add-missing --copy
 autoconf

data/ext/swfmill/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for swfmill 0.3.0 .
+# Generated by GNU Autoconf 2.61 for swfmill 0.3.1 .
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='swfmill'
 PACKAGE_TARNAME='swfmill'
-PACKAGE_VERSION='0.3.0 '
-PACKAGE_STRING='swfmill 0.3.0 '
+PACKAGE_VERSION='0.3.1 '
+PACKAGE_STRING='swfmill 0.3.1 '
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -825,6 +825,7 @@ am__leading_dot
 AMTAR
 am__tar
 am__untar
+GREP
 CXX
 CXXFLAGS
 LDFLAGS
@@ -856,7 +857,6 @@ host_cpu
 host_vendor
 host_os
 SED
-GREP
 EGREP
 LN_S
 ECHO
@@ -870,16 +870,17 @@ F77
 FFLAGS
 ac_ct_F77
 LIBTOOL
-HAVE_PKGCONFIG
+PKG_CONFIG
 IS_WINDOWS_TRUE
 IS_WINDOWS_FALSE
 IS_OSX_TRUE
 IS_OSX_FALSE
-PKG_CONFIG
 XML_CFLAGS
 XML_LIBS
 XSLT_CFLAGS
 XSLT_LIBS
+EXSLT_CFLAGS
+EXSLT_LIBS
 FREETYPE_CFLAGS
 FREETYPE_LIBS
 PNG_CFLAGS
@@ -907,6 +908,8 @@ XML_CFLAGS
 XML_LIBS
 XSLT_CFLAGS
 XSLT_LIBS
+EXSLT_CFLAGS
+EXSLT_LIBS
 FREETYPE_CFLAGS
 FREETYPE_LIBS
 PNG_CFLAGS
@@ -1413,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures swfmill 0.3.0  to adapt to many kinds of systems.
+\`configure' configures swfmill 0.3.1  to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1483,7 +1486,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of swfmill 0.3.0 :";;
+     short | recursive ) echo "Configuration of swfmill 0.3.1 :";;
    esac
   cat <<\_ACEOF
 
@@ -1525,6 +1528,9 @@ Some influential environment variables:
   XML_LIBS    linker flags for XML, overriding pkg-config
   XSLT_CFLAGS C compiler flags for XSLT, overriding pkg-config
   XSLT_LIBS   linker flags for XSLT, overriding pkg-config
+  EXSLT_CFLAGS
+              C compiler flags for EXSLT, overriding pkg-config
+  EXSLT_LIBS  linker flags for EXSLT, overriding pkg-config
   FREETYPE_CFLAGS
               C compiler flags for FREETYPE, overriding pkg-config
   FREETYPE_LIBS
@@ -1595,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-swfmill configure 0.3.0
+swfmill configure 0.3.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1609,7 +1615,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by swfmill $as_me 0.3.0 , which was
+It was created by swfmill $as_me 0.3.1 , which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2299,7 +2305,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=swfmill
- VERSION=0.3.0
+ VERSION=0.3.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2448,6 +2454,85 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 # Checks for programs.
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_GREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4223,85 +4308,6 @@ SED=$lt_cv_path_SED
 { echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6; }
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
 { echo "$as_me:$LINENO: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
@@ -4817,7 +4823,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4820 "configure"' > conftest.$ac_ext
+  echo '#line 4826 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7397,11 +7403,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7400: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7406: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7404: \$? = $ac_status" >&5
+   echo "$as_me:7410: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7687,11 +7693,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7690: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7696: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7694: \$? = $ac_status" >&5
+   echo "$as_me:7700: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7791,11 +7797,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7794: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7800: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7798: \$? = $ac_status" >&5
+   echo "$as_me:7804: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10168,7 +10174,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10171 "configure"
+#line 10177 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10268,7 +10274,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10271 "configure"
+#line 10277 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12669,11 +12675,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12672: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12678: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12676: \$? = $ac_status" >&5
+   echo "$as_me:12682: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12773,11 +12779,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12776: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12782: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12780: \$? = $ac_status" >&5
+   echo "$as_me:12786: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14371,11 +14377,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14374: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14380: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14378: \$? = $ac_status" >&5
+   echo "$as_me:14384: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14475,11 +14481,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14478: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14484: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14482: \$? = $ac_status" >&5
+   echo "$as_me:14488: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16695,11 +16701,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16698: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16704: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16702: \$? = $ac_status" >&5
+   echo "$as_me:16708: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16985,11 +16991,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16988: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16994: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16992: \$? = $ac_status" >&5
+   echo "$as_me:16998: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17089,11 +17095,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17092: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17098: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17096: \$? = $ac_status" >&5
+   echo "$as_me:17102: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19780,24 +19786,29 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_HAVE_PKGCONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$HAVE_PKGCONFIG"; then
-  ac_cv_prog_HAVE_PKGCONFIG="$HAVE_PKGCONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_HAVE_PKGCONFIG="yes"
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -19805,28 +19816,100 @@ done
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_HAVE_PKGCONFIG" && ac_cv_prog_HAVE_PKGCONFIG="no"
+  ;;
+esac
 fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
 fi
-HAVE_PKGCONFIG=$ac_cv_prog_HAVE_PKGCONFIG
-if test -n "$HAVE_PKGCONFIG"; then
-  { echo "$as_me:$LINENO: result: $HAVE_PKGCONFIG" >&5
-echo "${ECHO_T}$HAVE_PKGCONFIG" >&6; }
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
 else
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
 
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
 
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	else
+		{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+		PKG_CONFIG=""
+	fi
 
-if test "x$HAVE_PKGCONFIG" = "xno"; then
-  { { echo "$as_me:$LINENO: error: you need to have pkgconfig installed !" >&5
-echo "$as_me: error: you need to have pkgconfig installed !" >&2;}
-   { (exit 1); exit 1; }; }
 fi
 
 # cross-compile specifics
- if  echo $host_os | grep mingw > /dev/null ; then
+echo $host_os | $GREP mingw > /dev/null && IS_WINDOWS=yes
+echo $host_os | $GREP darwin > /dev/null && IS_OSX=yes
+ if  test $IS_WINDOWS ; then
   IS_WINDOWS_TRUE=
   IS_WINDOWS_FALSE='#'
 else
@@ -19834,7 +19917,7 @@ else
   IS_WINDOWS_FALSE=
 fi
 
- if  echo $host_os | grep darwin > /dev/null ; then
+ if  test $IS_OSX ; then
   IS_OSX_TRUE=
   IS_OSX_FALSE='#'
 else
@@ -19971,126 +20054,10 @@ fi
 
 
 # Checks for libraries.
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test $IS_OSX; then
+	test $XML_CFLAGS || XML_CFLAGS=-I/usr/include/libxml2
+	test $XML_LIBS || XML_LIBS=-lxml2
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	else
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-		PKG_CONFIG=""
-	fi
-
-fi
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for XML" >&5
@@ -20202,9 +20169,14 @@ else
 echo "${ECHO_T}yes" >&6; }
 	:
 fi
+fi
 
 
 
+if test $IS_OSX; then
+	test $XSLT_CFLAGS || XSLT_CFLAGS=-I/usr/include/libxml2
+	test $XSLT_LIBS || XSLT_LIBS="-lxslt -lxml2"
+else
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for XSLT" >&5
@@ -20215,12 +20187,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XSLT_CFLAGS="$XSLT_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexslt\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxslt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libxslt") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_XSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null`
+  pkg_cv_XSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20233,12 +20205,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XSLT_LIBS="$XSLT_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexslt\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxslt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libxslt") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_XSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null`
+  pkg_cv_XSLT_LIBS=`$PKG_CONFIG --libs "libxslt" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20257,14 +20229,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexslt"`
+	        XSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxslt"`
         else
-	        XSLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexslt"`
+	        XSLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxslt"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XSLT_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (libexslt) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (libxslt) were not met:
 
 $XSLT_PKG_ERRORS
 
@@ -20275,7 +20247,7 @@ Alternatively, you may set the environment variables XSLT_CFLAGS
 and XSLT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (libexslt) were not met:
+echo "$as_me: error: Package requirements (libxslt) were not met:
 
 $XSLT_PKG_ERRORS
 
@@ -20316,6 +20288,126 @@ else
 echo "${ECHO_T}yes" >&6; }
 	:
 fi
+fi
+
+
+
+if test $IS_OSX; then
+	test $EXSLT_CFLAGS || EXSLT_CFLAGS=-I/usr/include/libxml2
+	test $EXSLT_LIBS || EXSLT_LIBS="-lexslt -lxslt -lxml2"
+else
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for EXSLT" >&5
+echo $ECHO_N "checking for EXSLT... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$EXSLT_CFLAGS"; then
+        pkg_cv_EXSLT_CFLAGS="$EXSLT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexslt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_EXSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$EXSLT_LIBS"; then
+        pkg_cv_EXSLT_LIBS="$EXSLT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexslt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_EXSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        EXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexslt"`
+        else
+	        EXSLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexslt"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$EXSLT_PKG_ERRORS" >&5
+
+	{ { echo "$as_me:$LINENO: error: Package requirements (libexslt) were not met:
+
+$EXSLT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables EXSLT_CFLAGS
+and EXSLT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (libexslt) were not met:
+
+$EXSLT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables EXSLT_CFLAGS
+and EXSLT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables EXSLT_CFLAGS
+and EXSLT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables EXSLT_CFLAGS
+and EXSLT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	EXSLT_CFLAGS=$pkg_cv_EXSLT_CFLAGS
+	EXSLT_LIBS=$pkg_cv_EXSLT_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	:
+fi
+fi
 
 
 
@@ -20547,11 +20639,7 @@ fi
 
 
 
-#PKG_CHECK_MODULES(CROCO, libcroco)
-#AC_SUBST(CROCO_CFLAGS)
-#AC_SUBST(CROCO_LIBS)
-
-ac_config_files="$ac_config_files Makefile src/Makefile src/swft/Makefile src/xslt/Makefile src/codegen/Makefile test/Makefile test/xml/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile test/xml/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -21014,7 +21102,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by swfmill $as_me 0.3.0 , which was
+This file was extended by swfmill $as_me 0.3.1 , which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21061,7 +21149,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-swfmill config.status 0.3.0
+swfmill config.status 0.3.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -21169,9 +21257,6 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/swft/Makefile") CONFIG_FILES="$CONFIG_FILES src/swft/Makefile" ;;
-    "src/xslt/Makefile") CONFIG_FILES="$CONFIG_FILES src/xslt/Makefile" ;;
-    "src/codegen/Makefile") CONFIG_FILES="$CONFIG_FILES src/codegen/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "test/xml/Makefile") CONFIG_FILES="$CONFIG_FILES test/xml/Makefile" ;;
 
@@ -21294,6 +21379,7 @@ am__leading_dot!$am__leading_dot$ac_delim
 AMTAR!$AMTAR$ac_delim
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
+GREP!$GREP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -21325,7 +21411,6 @@ host_cpu!$host_cpu$ac_delim
 host_vendor!$host_vendor$ac_delim
 host_os!$host_os$ac_delim
 SED!$SED$ac_delim
-GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
@@ -21380,16 +21465,17 @@ F77!$F77$ac_delim
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
-HAVE_PKGCONFIG!$HAVE_PKGCONFIG$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
 IS_WINDOWS_TRUE!$IS_WINDOWS_TRUE$ac_delim
 IS_WINDOWS_FALSE!$IS_WINDOWS_FALSE$ac_delim
 IS_OSX_TRUE!$IS_OSX_TRUE$ac_delim
 IS_OSX_FALSE!$IS_OSX_FALSE$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
 XML_CFLAGS!$XML_CFLAGS$ac_delim
 XML_LIBS!$XML_LIBS$ac_delim
 XSLT_CFLAGS!$XSLT_CFLAGS$ac_delim
 XSLT_LIBS!$XSLT_LIBS$ac_delim
+EXSLT_CFLAGS!$EXSLT_CFLAGS$ac_delim
+EXSLT_LIBS!$EXSLT_LIBS$ac_delim
 FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
 FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
 PNG_CFLAGS!$PNG_CFLAGS$ac_delim
@@ -21398,7 +21484,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5