Permalink
Browse files

changed: Don't compile/link rar support when nonfree is disabled

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24080 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
althekiller
althekiller committed Oct 27, 2009
1 parent aa8381c commit 57f79a14b18c2f0a53296c117d02a2d7db2008bd
Showing with 9 additions and 2 deletions.
  1. +5 −1 Makefile.in
  2. +4 −1 configure.in
View
@@ -363,12 +363,16 @@ OBJSXBMC= \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a \
xbmc/lib/sqLite/sqllite.a \
- xbmc/lib/UnrarXLib/UnrarXLib.a \
xbmc/lib/libsquish/libsquish-@ARCH@.a \
xbmc/screensavers/screensaver.a \
xbmc/settings/settings.a \
xbmc/visualizations/visualization.a
+ifeq (@HAVE_XBMC_NONFREE@,1)
+OBJSXBMC+= \
+ xbmc/lib/UnrarXLib/UnrarXLib.a
+endif
+
DYNOBJSXBMC= \
xbmc/lib/libcmyth/libcmyth.a \
xbmc/linux/linux.a \
View
@@ -920,8 +920,10 @@ else
fi
if test "$use_nonfree" = "yes"; then
final_message="$final_message\n Non-free:\tYes"
- AC_DEFINE([HAVE_XBMC_NONFREE], [], [Define to 1 to enable non-free components.])
+ HAVE_XBMC_NONFREE=1
+ AC_DEFINE([HAVE_XBMC_NONFREE], [1], [Define to 1 to enable non-free components.])
else
+ HAVE_XBMC_NONFREE=0
final_message="$final_message\n Non-free:\tNo"
fi
@@ -1045,6 +1047,7 @@ AC_SUBST(USE_PYTHON2_6)
AC_SUBST(USE_PYTHON2_5)
AC_SUBST(USE_PYTHON2_4)
AC_SUBST(OUTPUT_FILES)
+AC_SUBST(HAVE_XBMC_NONFREE)
# Function to run the configure scripts in our submodules
# Consists of three paramaters, the path to the submodule, the configure command
# with appropriate arguments, and a third parameter set to 1 if we are to skip

0 comments on commit 57f79a1

Please sign in to comment.