diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /m4 | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/input.m4 | 7 | ||||
| -rw-r--r-- | m4/summary.m4 | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/m4/input.m4 b/m4/input.m4 index 1446eaf09..1e2f72113 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -139,4 +139,11 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ AC_SUBST(LIBVCD_LIBS) AM_CONDITIONAL([ENABLE_VCD], [test x"$enable_vcd" != x"no"]) AM_CONDITIONAL([ENABLE_VCDO], [test x"$enable_vcdo" != x"no"]) + + + dnl vdr + AC_ARG_ENABLE([vdr], + [AS_HELP_STRING([--enable-vdr], [Enable support for the VDR plugin (default: enabled)])], + [test x"$enableval" != x"no" && enable_vdr="yes"]) + AM_CONDITIONAL([ENABLE_VDR], [test x"$enable_vdr" != x"no"]) ]) diff --git a/m4/summary.m4 b/m4/summary.m4 index 996374424..a96e11e5a 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -24,7 +24,8 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ else echo " - dvd (internal libs)" fi - test x"$have_dvb" = x"yes" && echo " - dvb - vdr" + test x"$enable_vdr" != x"no" && echo " - vdr" + test x"$have_dvb" = x"yes" && echo " - dvb" test x"$have_gnomevfs" = x"yes" && echo " - gnome-vfs" test x"$have_samba" = x"yes" && echo " - smb" test x"$have_v4l" = x"yes" && echo " - v4l" |