diff --git a/.cvsignore b/.cvsignore
index cc98bde..b35d86f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jansson-1.1.3.tar.bz2
+jansson-1.2.tar.bz2
diff --git a/jansson-pkgconfig.patch b/jansson-pkgconfig.patch
deleted file mode 100644
index 12e3d61..0000000
--- a/jansson-pkgconfig.patch
+++ /dev/null
@@ -1,1145 +0,0 @@
-diff -uNr jansson-1.1.3/aclocal.m4 jansson-1.1.3-my/aclocal.m4
---- jansson-1.1.3/aclocal.m4	2009-12-18 11:43:47.000000000 -0800
-+++ jansson-1.1.3-my/aclocal.m4	2010-01-07 02:34:11.774969212 -0800
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -2485,10 +2485,13 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2500,18 +2503,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -3103,7 +3094,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -3784,7 +3775,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd* | netbsdelf*-gnu)
-+      netbsd*)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4209,9 +4200,6 @@
-   cygwin* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
--  linux* | k*bsd*-gnu)
--    _LT_TAGVAR(link_all_deplibs, $1)=no
--  ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -4276,9 +4264,6 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu)
--    _LT_TAGVAR(link_all_deplibs, $1)=no
--    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4461,7 +4446,7 @@
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -4636,7 +4621,6 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
--	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -4875,7 +4859,7 @@
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -7878,15 +7862,15 @@
- 
- # Generated from ltversion.in.
- 
--# serial 3012 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
- 
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-@@ -7999,7 +7983,7 @@
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -8015,7 +7999,7 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff -uNr jansson-1.1.3/configure jansson-1.1.3-my/configure
---- jansson-1.1.3/configure	2009-12-18 11:43:58.000000000 -0800
-+++ jansson-1.1.3-my/configure	2010-01-07 02:41:38.676010339 -0800
-@@ -1,12 +1,14 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for jansson 1.1.3.
-+# Generated by GNU Autoconf 2.65 for jansson 1.1.3.
- #
- # Report bugs to <petri@digip.org>.
- #
-+#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -676,7 +678,8 @@
- 
- 
- 
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -1509,7 +1512,7 @@
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-   LIBS        libraries to pass to the linker, e.g. -l<library>
--  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
- 
-@@ -1580,7 +1583,7 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- jansson configure 1.1.3
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1627,7 +1630,7 @@
- 	ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
- 
-@@ -1673,7 +1676,7 @@
-   # left behind by Apple's compiler.  We do this before executing the actions.
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_link
- 
-@@ -1741,7 +1744,7 @@
-     ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_cpp
- 
-@@ -1783,7 +1786,7 @@
- fi
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_run
- 
-@@ -1858,7 +1861,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by jansson $as_me 1.1.3, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2111,7 +2114,7 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-   test "x$ac_site_file" = xNONE && continue
--  if test -r "$ac_site_file"; then
-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-@@ -2120,9 +2123,9 @@
- done
- 
- if test -r "$cache_file"; then
--  # Some versions of bash will fail to source /dev/null (special
--  # files actually), so we avoid doing that.
--  if test -f "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special files
-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-@@ -2542,6 +2545,7 @@
- 
- fi
- 
-+  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -2549,7 +2553,6 @@
-     # value for MKDIR_P within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
--    test -d ./--version && rmdir ./--version
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
-@@ -3034,32 +3037,30 @@
- ... rest of stderr output deleted ...
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
--    rm -f conftest.er1 conftest.err
-   fi
-+  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
- 
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -3121,10 +3122,10 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3132,51 +3133,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3209,13 +3177,72 @@
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -3676,8 +3703,8 @@
- 
- 
- 
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
- 
- 
- 
-@@ -4348,13 +4375,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:4351: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4378: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4354: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4381: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4357: output\"" >&5)
-+  (eval echo "\"\$as_me:4384: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -4824,7 +4851,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -5560,7 +5587,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 5563 "configure"' > conftest.$ac_ext
-+  echo '#line 5590 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7086,11 +7113,11 @@
-    -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:7089: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7116: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7093: \$? = $ac_status" >&5
-+   echo "$as_me:7120: \$? = $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.
-@@ -7425,11 +7452,11 @@
-    -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:7428: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7455: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7432: \$? = $ac_status" >&5
-+   echo "$as_me:7459: \$? = $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.
-@@ -7530,11 +7557,11 @@
-    -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:7533: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7560: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7537: \$? = $ac_status" >&5
-+   echo "$as_me:7564: \$? = $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
-@@ -7585,11 +7612,11 @@
-    -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:7588: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7615: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7592: \$? = $ac_status" >&5
-+   echo "$as_me:7619: \$? = $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
-@@ -7704,9 +7731,6 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu)
--    link_all_deplibs=no
--    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -7889,7 +7913,7 @@
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -8064,7 +8088,6 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
--	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -8391,7 +8414,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -9321,10 +9344,13 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9336,18 +9362,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -9968,7 +9982,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 9971 "configure"
-+#line 9985 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10064,7 +10078,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10067 "configure"
-+#line 10081 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10300,7 +10314,7 @@
- 
- # Checks for library functions.
- 
--ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile test/Makefile test/testdata/Makefile test/testprogs/Makefile"
-+ac_config_files="$ac_config_files jansson.pc Makefile doc/Makefile src/Makefile test/Makefile test/testdata/Makefile test/testprogs/Makefile"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -10824,7 +10838,7 @@
- # values after options handling.
- ac_log="
- This file was extended by jansson $as_me 1.1.3, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -10864,6 +10878,7 @@
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-   -q, --quiet, --silent
-                    do not print progress messages
-   -d, --debug      don't remove temporary files
-@@ -10886,10 +10901,11 @@
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- jansson config.status 1.1.3
--configured by $0, generated by GNU Autoconf 2.64,
--  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+  with options \\"\$ac_cs_config\\"
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -10927,6 +10943,8 @@
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-@@ -11266,6 +11284,7 @@
-     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+    "jansson.pc") CONFIG_FILES="$CONFIG_FILES jansson.pc" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-@@ -11375,7 +11394,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -11389,7 +11408,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-diff -uNr jansson-1.1.3/configure.ac jansson-1.1.3-my/configure.ac
---- jansson-1.1.3/configure.ac	2010-01-07 02:28:17.537091676 -0800
-+++ jansson-1.1.3-my/configure.ac	2010-01-07 02:29:27.193742853 -0800
-@@ -19,6 +19,7 @@
- # Checks for library functions.
- 
- AC_CONFIG_FILES([
-+        jansson.pc
-         Makefile
-         doc/Makefile
-         src/Makefile
-diff -uNr jansson-1.1.3/doc/Makefile.in jansson-1.1.3-my/doc/Makefile.in
---- jansson-1.1.3/doc/Makefile.in	2009-12-18 11:44:00.000000000 -0800
-+++ jansson-1.1.3-my/doc/Makefile.in	2010-01-07 02:41:43.759880406 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -uNr jansson-1.1.3/jansson.pc.in jansson-1.1.3-my/jansson.pc.in
---- jansson-1.1.3/jansson.pc.in	1969-12-31 16:00:00.000000000 -0800
-+++ jansson-1.1.3-my/jansson.pc.in	2010-01-07 02:30:28.832720853 -0800
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=${prefix}/include
-+
-+Name: jansson
-+Description: Library for encoding, decoding and manipulating JSON data
-+Version: @VERSION@
-+Libs: -L${libdir} -ljansson
-+Cflags: -I${includedir}
-diff -uNr jansson-1.1.3/ltmain.sh jansson-1.1.3-my/ltmain.sh
---- jansson-1.1.3/ltmain.sh	2009-12-18 11:43:50.000000000 -0800
-+++ jansson-1.1.3-my/ltmain.sh	2009-12-02 03:34:25.000000000 -0800
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
- 
--# ltmain.sh (GNU libtool) 2.2.6
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-@@ -65,7 +65,7 @@
- #       compiler:		$LTCC
- #       compiler flags:		$LTCFLAGS
- #       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
-+#       $progname:		(GNU libtool) 2.2.6b
- #       automake:		$automake_version
- #       autoconf:		$autoconf_version
- #
-@@ -73,9 +73,9 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="2.2.6 Debian-2.2.6a-4"
-+VERSION=2.2.6b
- TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3017
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -5033,10 +5033,7 @@
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link)
--	  libs="$deplibs %DEPLIBS%"
--	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
--	  ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5347,19 +5344,19 @@
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
--	    tmp_libs=
--	    for deplib in $dependency_libs; do
--	      deplibs="$deplib $deplibs"
--	      if $opt_duplicate_deps ; then
--		case "$tmp_libs " in
--		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--		esac
--	      fi
--	      tmp_libs="$tmp_libs $deplib"
--	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    deplibs="$deplib $deplibs"
-+	    if $opt_duplicate_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
- 	  continue
- 	fi # $pass = conv
- 
-@@ -5896,7 +5893,6 @@
- 	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
--	      path=
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
-@@ -6210,9 +6206,6 @@
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
--	  *)
--	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
--	    ;;
- 	  esac
- 	  ;;
- 	no)
-diff -uNr jansson-1.1.3/Makefile.am jansson-1.1.3-my/Makefile.am
---- jansson-1.1.3/Makefile.am	2009-12-18 11:33:30.000000000 -0800
-+++ jansson-1.1.3-my/Makefile.am	2010-01-07 02:32:33.948981497 -0800
-@@ -1,6 +1,9 @@
- EXTRA_DIST = CHANGES LICENSE README.rst
- SUBDIRS = doc src test
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = jansson.pc
-+
- distcheck-hook:
- 	sphinx-build -b html -W \
- 		$(distdir)/doc \
-diff -uNr jansson-1.1.3/Makefile.in jansson-1.1.3-my/Makefile.in
---- jansson-1.1.3/Makefile.in	2009-12-18 11:44:02.000000000 -0800
-+++ jansson-1.1.3-my/Makefile.in	2010-01-07 02:41:44.108881990 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -14,6 +14,7 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
-+
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -36,8 +37,8 @@
- subdir = .
- DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
--	$(top_srcdir)/configure config.guess config.sub depcomp \
--	install-sh ltmain.sh missing
-+	$(srcdir)/jansson.pc.in $(top_srcdir)/configure config.guess \
-+	config.sub depcomp install-sh ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -46,7 +47,7 @@
-  configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_FILES = jansson.pc
- CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
-@@ -57,6 +58,29 @@
- 	install-pdf-recursive install-ps-recursive install-recursive \
- 	installcheck-recursive installdirs-recursive pdf-recursive \
- 	ps-recursive uninstall-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+  for p in $$list; do echo "$$p $$p"; done | \
-+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+    if (++n[$$2] == $(am__install_max)) \
-+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+    END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-+DATA = $(pkgconfig_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -214,6 +238,8 @@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = CHANGES LICENSE README.rst
- SUBDIRS = doc src test
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = jansson.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -269,6 +295,8 @@
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1
-+jansson.pc: $(top_builddir)/config.status $(srcdir)/jansson.pc.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -278,6 +306,26 @@
- 
- distclean-libtool:
- 	-rm -f libtool config.lt
-+install-pkgconfigDATA: $(pkgconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-+	done
-+
-+uninstall-pkgconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -286,7 +334,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -311,7 +359,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -475,7 +523,8 @@
- 	  fi; \
- 	done
- 	-test -n "$(am__skip_mode_fix)" \
--	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -519,17 +568,17 @@
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lzma*) \
--	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-@@ -591,9 +640,12 @@
- 	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--all-am: Makefile config.h
-+all-am: Makefile $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
-+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -641,7 +693,7 @@
- 
- info-am:
- 
--install-data-am:
-+install-data-am: install-pkgconfigDATA
- 
- install-dvi: install-dvi-recursive
- 
-@@ -687,7 +739,7 @@
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-pkgconfigDATA
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- 	ctags-recursive install-am install-strip tags-recursive
-@@ -702,11 +754,12 @@
- 	install install-am install-data install-data-am install-dvi \
- 	install-dvi-am install-exec install-exec-am install-html \
- 	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am tags tags-recursive uninstall uninstall-am
-+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
-+	installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-pkgconfigDATA
- 
- 
- distcheck-hook:
-diff -uNr jansson-1.1.3/src/Makefile.in jansson-1.1.3-my/src/Makefile.in
---- jansson-1.1.3/src/Makefile.in	2009-12-18 11:44:01.000000000 -0800
-+++ jansson-1.1.3-my/src/Makefile.in	2010-01-07 02:41:43.837882015 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -uNr jansson-1.1.3/test/Makefile.in jansson-1.1.3-my/test/Makefile.in
---- jansson-1.1.3/test/Makefile.in	2009-12-18 11:44:01.000000000 -0800
-+++ jansson-1.1.3-my/test/Makefile.in	2010-01-07 02:41:43.918885264 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -336,7 +336,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -361,7 +361,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -uNr jansson-1.1.3/test/testdata/Makefile.in jansson-1.1.3-my/test/testdata/Makefile.in
---- jansson-1.1.3/test/testdata/Makefile.in	2009-12-18 11:44:01.000000000 -0800
-+++ jansson-1.1.3-my/test/testdata/Makefile.in	2010-01-07 02:41:43.966885349 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -uNr jansson-1.1.3/test/testprogs/Makefile.in jansson-1.1.3-my/test/testprogs/Makefile.in
---- jansson-1.1.3/test/testprogs/Makefile.in	2009-12-18 11:44:01.000000000 -0800
-+++ jansson-1.1.3-my/test/testprogs/Makefile.in	2010-01-07 02:41:44.042879762 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/jansson.spec b/jansson.spec
index 0adfb06..476be24 100644
--- a/jansson.spec
+++ b/jansson.spec
@@ -1,14 +1,12 @@
 Name:		jansson
-Version:	1.1.3
-Release:	4%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 Summary:	C library for encoding, decoding and manipulating JSON data
 
 Group:		System Environment/Libraries
 License:	MIT
 URL:		http://www.digip.org/jansson/
 Source0:	http://www.digip.org/jansson/releases/jansson-%{version}.tar.bz2
-# adds pkg-config support; emailed to upstream author
-Patch0:		jansson-pkgconfig.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-sphinx
@@ -27,13 +25,11 @@ Header files for developing applications making use of jansson.
 
 %prep
 %setup -q
-%patch0 -p1
-touch config.h.in
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
-cd doc ; sphinx-build . .build/html
+make html
 
 %check
 make check
@@ -57,12 +53,15 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/.build/html/*
+%doc doc/_build/html/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
 %changelog
+* Thu Jan 21 2010 Sean Middleditch <sean@middleditch.us> 1.2-1
+- Update to Jansson 1.2.
+
 * Thu Jan 11 2010 Sean Middleditch <sean@middleditch.us> 1.1.3-4
 - Update jansson description per upstream's suggestions.
 - Removed README from docs.
diff --git a/sources b/sources
index 663c565..75174c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55c3e3b86d3b934da33660a5fed8d97b  jansson-1.1.3.tar.bz2
+762b7db7ecad0eb9c5e2d2b0947b07e5  jansson-1.2.tar.bz2