Convert the last bits for libdom

diff --git a/Makefile b/Makefile
index cb393a7b7a8f6eb39c751e69bd204e1f17230a39..ff41860122cf2f432d709c64012eca379157a4d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,12 +34,12 @@ endif
 # libdom
 ifneq ($(PKGCONFIG),)
   CFLAGS := $(CFLAGS) \
-               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom)
-  LDFLAGS := $(LDFLAGS) \
-               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom)
+               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet)
+  LDFLAGS := $(LDFLAGS) -lm \
+               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet)
 else
   CFLAGS := $(CFLAGS) -I$(PREFIX)/include
-  LDFLAGS := $(CFLAGS) -ldom
+  LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm
 endif
 
 include $(NSBUILD)/Makefile.top

diff --git a/test/svgtiny_test.c b/test/svgtiny_test.c
index 2a2c862e4541d2ede3fe5da5678173f78dac9744..1b507fddfda7c2a811f9f379556dc26623debef0 100644 (file)
--- a/test/svgtiny_test.c
+++ b/test/svgtiny_test.c
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include "svgtiny.h"
 
 
@@ -78,8 +79,8 @@ int main(int argc, char *argv[])
                case svgtiny_OUT_OF_MEMORY:
                        fprintf(stderr, "svgtiny_OUT_OF_MEMORY");
                        break;
-               case svgtiny_LIBXML_ERROR:
-                       fprintf(stderr, "svgtiny_LIBXML_ERROR");
+               case svgtiny_LIBDOM_ERROR:
+                       fprintf(stderr, "svgtiny_LIBDOM_ERROR");
                        break;
                case svgtiny_NOT_SVG:
                        fprintf(stderr, "svgtiny_NOT_SVG");