Skip to content
Browse files

[project] Added option --enable-addons-with-dependencies (that defaul…

…ts to disabled)

Build addons with external dependencies only when this option is set.
  • Loading branch information...
1 parent fe59378 commit 3032afdeb1d9ea11bc82e2fba52c396ba7b28520 @fetzerch committed Oct 25, 2012
Showing with 43 additions and 16 deletions.
  1. +2 −0 .dummy.am
  2. +2 −0 .gitignore
  3. +39 −16 configure.ac
View
2 .dummy.am
@@ -0,0 +1,2 @@
+# Does nothing intentionally.
+# This exists solely so we can use AM_INIT_AUTOMAKE in configure.in
View
2 .gitignore
@@ -4,6 +4,8 @@
.libs
.project
+.dummy
+.dummy.in
aclocal.m4
autom4te.cache
config.log
View
55 configure.ac
@@ -29,6 +29,13 @@ AC_ARG_ENABLE([external-ffmpeg],
[use_external_ffmpeg=$enableval],
[use_external_ffmpeg=no])
+### External dependencies option
+AC_ARG_ENABLE([addons-with-dependencies],
+ [AS_HELP_STRING([--enable-addons-with-dependencies],
+ [enable build of addons that depend on external libraries (default is no)])],
+ [build_addons_with_dependencies=$enableval],
+ [build_addons_with_dependencies=no])
+
BUILD_TYPE="debug"
if test "$use_release" = "yes"; then
BUILD_TYPE="release"
@@ -108,6 +115,14 @@ AC_SUBST(FFMPEG_INCLUDES)
### End external Libraries
+### Build addons with dependencies
+if test "$build_addons_with_dependencies" = "yes"; then
+ echo "Building addons with dependencies"
+
+ ### Addons with dependencies
+ OUTPUT_FILES_ADDONS_WITH_DEPENDENCIES=""
+fi
+
### Check for Intree building
if test "x${cross_compiling}" = "xyes" || test "x${cross_compiling}" = "xmaybe"; then
# don't call AC_CHECK_FILE when (maybe) cross-compiling
@@ -156,19 +171,27 @@ else
fi
AC_SUBST(DATADIR)
-
-AC_OUTPUT([Makefile
- lib/Makefile
- lib/jsoncpp/Makefile
- lib/libhts/Makefile
- lib/tinyxml/Makefile
- addons/Makefile
- addons/pvr.demo/Makefile
- addons/pvr.fortherecord.argus/Makefile
- addons/pvr.hts/Makefile
- addons/pvr.mediaportal.tvserver/Makefile
- addons/pvr.nextpvr/Makefile
- addons/pvr.njoy/Makefile
- addons/pvr.vuplus/Makefile
- addons/pvr.vdr.vnsi/Makefile])
-
+OUTPUT_FILES="Makefile \
+ lib/Makefile \
+ lib/jsoncpp/Makefile \
+ lib/libhts/Makefile \
+ lib/tinyxml/Makefile \
+ addons/Makefile \
+ addons/pvr.demo/Makefile \
+ addons/pvr.fortherecord.argus/Makefile \
+ addons/pvr.hts/Makefile \
+ addons/pvr.mediaportal.tvserver/Makefile \
+ addons/pvr.nextpvr/Makefile \
+ addons/pvr.njoy/Makefile \
+ addons/pvr.vuplus/Makefile \
+ addons/pvr.vdr.vnsi/Makefile \
+ $OUTPUT_FILES_ADDONS_WITH_DEPENDENCIES"
+
+# Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
+# .dummy.am does nothing.
+AC_CONFIG_FILES([.dummy])
+
+AC_CONFIG_FILES([$OUTPUT_FILES])
+OUTPUT_FILES="$OUTPUT_FILES .dummy"
+
+AC_OUTPUT

0 comments on commit 3032afd

Please sign in to comment.
Something went wrong with that request. Please try again.