From: Chow Loong Jin <hyperair@debian.org> Date: Thu, 26 Jan 2012 10:51:13 +0800 Subject: Don't expose tinyxml dependency --- Project/GNU/Library/configure.ac | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac index f3f57c4..08f7ca1 100755 --- a/Project/GNU/Library/configure.ac +++ b/Project/GNU/Library/configure.ac @@ -521,16 +521,11 @@ dnl ------------------------------------------------------------------------- dnl libtinyxml dnl if test "$with_libtinyxml" = "yes"; then - if pkg-config --exists tinyxml; then - CXXFLAGS="$CXXFLAGS $(pkg-config --cflags tinyxml)" - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags tinyxml)" - MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs tinyxml)" - MediaInfoLib_Requires="$MediaInfoLib_Requires tinyxml" - using_libtinyxml="system" - AM_CONDITIONAL(COMPILE_TINYXML, false) - else - AC_MSG_ERROR([libtinyxml is not found, please install development package of libtinyxml]) - fi + PKG_CHECK_MODULES([TINYXML], [tinyxml]) + CXXFLAGS="$CXXFLAGS $TINYXML_CXXFLAGS" + LIBS="$LIBS $TINYXML_LIBS" + AM_CONDITIONAL(COMPILE_TINYXML, false) + using_libtinyxml="system" else CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/tinyxml" using_libtinyxml="internal" --