Merge branch 'develop'

Juniper · Jan 29, 2014 · 4c437b8 · 4c437b8
2 parents 5e1285b + add22e2
commit 4c437b8
Show file tree

Hide file tree

Showing 12 changed files with 116 additions and 348 deletions.
diff --git a/extensions/bit/Makefile.am b/extensions/bit/Makefile.am
@@ -33,7 +33,8 @@ pkglib_LTLIBRARIES = libext_bit.la
 LIBS = \
     ${LIBXSLT_LIBS} \
     -lexslt \
-    ${LIBXML_LIBS}
+    ${LIBXML_LIBS} \
+    -L${top_builddir}/libslax -lslax
 
 LDADD = ${top_builddir}/libslax/libslax.la
 

diff --git a/extensions/curl/Makefile.am b/extensions/curl/Makefile.am
@@ -37,7 +37,8 @@ LIBS = \
     ${LIBXSLT_LIBS} \
     -lexslt \
     ${LIBXML_LIBS} \
-    ${LIBCURL_LIBS}
+    ${LIBCURL_LIBS} \
+    -L${top_builddir}/libslax -lslax
 
 LDADD = ${top_builddir}/libslax/libslax.la
 

diff --git a/extensions/exslt/Makefile.am b/extensions/exslt/Makefile.am
@@ -29,7 +29,10 @@ AM_CFLAGS += \
 LIBNAME = libext_exslt
 pkglib_LTLIBRARIES = libext_exslt.la
 LIBS = \
-    ${LIBXSLT_LIBS} -lexslt ${LIBXML_LIBS}
+    ${LIBXSLT_LIBS} \
+    -lexslt \
+    ${LIBXML_LIBS} \
+    -L${top_builddir}/libslax -lslax
 
 LDADD = ${top_builddir}/libslax/libslax.la
 

diff --git a/extensions/os/Makefile.am b/extensions/os/Makefile.am
@@ -29,7 +29,10 @@ AM_CFLAGS += \
 LIBNAME = libext_os
 pkglib_LTLIBRARIES = libext_os.la
 LIBS = \
-    ${LIBXSLT_LIBS} -lexslt ${LIBXML_LIBS}
+    ${LIBXSLT_LIBS} \
+    -lexslt \
+    ${LIBXML_LIBS} \
+    -L${top_builddir}/libslax -lslax
 
 LDADD = ${top_builddir}/libslax/libslax.la
 

diff --git a/extensions/xutil/Makefile.am b/extensions/xutil/Makefile.am
@@ -32,7 +32,8 @@ pkglib_LTLIBRARIES = libext_xutil.la
 LIBS = \
     ${LIBXSLT_LIBS} \
     -lexslt \
-    ${LIBXML_LIBS}
+    ${LIBXML_LIBS} \
+    -L${top_builddir}/libslax -lslax
 
 LDADD = ${top_builddir}/libslax/libslax.la
 

diff --git a/libslax/jsonparser.y b/libslax/jsonparser.y