summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac11
-rw-r--r--src/xine-engine/tvmode.c5
2 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 578f267c1..5780191b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,21 +259,17 @@ AM_CONDITIONAL(HAVE_X11, [test x"$no_x" != "xyes"])
dnl ---------------------------------------------
dnl tvmode support using nvtv
dnl ---------------------------------------------
-AC_ARG_ENABLE(nvtv,
- [ --enable-nvtv use nvtv for output fullscreen to TV],
- enable_nvtv=$enableval,
- enable_nvtv=no)
+
+AC_ARG_ENABLE(nvtv, [ --enable-nvtv use nvtv for output fullscreen to TV [default=no]], enable_nvtv="$enableval", enable_nvtv=no)
AC_MSG_CHECKING(for nvtv support)
-XINE_HAVE_NVTV="#undef XINE_HAVE_NVTV"
if test x"$enable_nvtv" = "xyes" -a x"$no_x" != "xyes"; then
AC_MSG_RESULT(enabled)
- XINE_HAVE_NVTV="#define XINE_HAVE_NVTV 1"
+ AC_DEFINE(XINE_HAVE_NVTV,1,[Define this if you want nvtvd tvmode support])
else
AC_MSG_RESULT(disabled)
fi
-AC_SUBST(XINE_HAVE_NVTV)
AM_CONDITIONAL(HAVE_NVTV, [test x"$enable_nvtv" = "xyes" -a x"$no_x" != "xyes"])
@@ -1236,6 +1232,7 @@ src/libffmpeg/libavcodec/armv4l/Makefile
src/libffmpeg/libavcodec/i386/Makefile
src/libffmpeg/libavcodec/mlib/Makefile
src/libffmpeg/libavcodec/alpha/Makefile
+src/libflac/Makefile
src/liblpcm/Makefile
src/libmad/Makefile
src/libmpeg2/Makefile
diff --git a/src/xine-engine/tvmode.c b/src/xine-engine/tvmode.c
index 0d410c08f..787be4dd6 100644
--- a/src/xine-engine/tvmode.c
+++ b/src/xine-engine/tvmode.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: tvmode.c,v 1.10 2003/01/18 15:29:22 miguelfreitas Exp $
+ * $Id: tvmode.c,v 1.11 2003/01/19 14:55:56 miguelfreitas Exp $
*
* tvmode - TV output selection
*
@@ -26,6 +26,9 @@
* xine support hacked in by Matthias Hopf <mat@mshopf.de>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>