use autoconf macros for determining xml2 and xmlccwrap linking

diff --git a/configure.ac b/configure.ac
index fb9860c7b07db3153bab54150e722224da9428ea..a184fe8c5d4c28f32e15d5019e7f9cf80e8e45eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,12 @@ AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_LIBUNGIF="yes", HAVE_LIBUNGIF="no")
 LIBUNGIF_LIBS="-lungif"
 AC_SUBST(LIBUNGIF_LIBS)
 
 LIBUNGIF_LIBS="-lungif"
 AC_SUBST(LIBUNGIF_LIBS)
 

+TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0)
+
+# ok, we are in trouble: XMLCCWRAP only defines C++ symbols. So let's just check if linking works,
+# and assume everything will be ok. Then just check for the "exit" symbol, which should be always there.
+TUXBOX_APPS_LIB_SYMBOL(XMLCCWRAP, xmlccwrap, exit)
+

 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
        AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
        AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])

diff --git a/main/Makefile.am b/main/Makefile.am
index 42b0e01b7f38bd5d3e4e50aabb915e0488460eba..9bc728afc83678c024d6fdd5ed0172bf588f4e90 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -46,7 +46,9 @@ enigma2_LDADD = \
        @GSTREAMER_LIBS@ \
        @JPEG_LIBS@ \
        @LIBUNGIF_LIBS@ \
        @GSTREAMER_LIBS@ \
        @JPEG_LIBS@ \
        @LIBUNGIF_LIBS@ \

-       -ldl -lpthread -lcrypt -lresolv -lxml2 -lxmlccwrap
+       @XML2_LIBS@ \
+       @XMLCCWRAP_LIBS@ \
+       -ldl -lpthread -lcrypt -lresolv

 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 #      @rm -f enigma2$(EXEEXT)
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 #      @rm -f enigma2$(EXEEXT)