diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2007-11-04 23:06:36 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2007-11-04 23:06:36 +0000 |
| commit | 14b4c911f077639728fa51a5246739670ca62fdc (patch) | |
| tree | 73231acc9e944fb343424c98e6ffa4c882b02ec8 | |
| parent | 3239483691684e77e0ecd555e2b643e9245c37c6 (diff) | |
| download | enigma2-14b4c911f077639728fa51a5246739670ca62fdc.tar.gz enigma2-14b4c911f077639728fa51a5246739670ca62fdc.zip | |
use autoconf macros for determining xml2 and xmlccwrap linking
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | main/Makefile.am | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index fb9860c7..a184fe8c 100644 --- 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) +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]) diff --git a/main/Makefile.am b/main/Makefile.am index 42b0e01b..9bc728af 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -46,7 +46,9 @@ enigma2_LDADD = \ @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) |