---
 Makefile.am        |    1 +
 configure.ac       |   16 +++++++---------
 playdv/Makefile.am |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

Index: libdv-1.0.0/Makefile.am
===================================================================
--- libdv-1.0.0.orig/Makefile.am
+++ libdv-1.0.0/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 if HAVE_GTK
 gtk_subdirs = playdv
 else
Index: libdv-1.0.0/configure.ac
===================================================================
--- libdv-1.0.0.orig/configure.ac
+++ libdv-1.0.0/configure.ac
@@ -1,20 +1,22 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(libdv/parse.c)
+AC_INIT
+AC_CONFIG_SRCDIR([libdv/parse.c])
 dnl AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
-
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 RPM_RELEASE=1
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(libdv, 1.0.0)
 
 AM_MAINTAINER_MODE
-AC_LIBTOOL_PICMODE(no)
 
 dnl Checks for programs.
 
 AC_SUBST(CFLAGS)
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AM_PROG_AS
 AS="${CC}"	# stupid automake bug
 
@@ -25,9 +27,6 @@ if test "$GCC" = "yes"; then
    CFLAGS="$CFLAGS -Wall"
 fi
 
-AH_TEMPLATE([_GNU_SOURCE],
-            [Define to enable GNU extensions of glibc, notably large file support])
-           
 AH_TEMPLATE([YUV_420_USE_YV12],
             [Define to 1 to use planar YUV format for 420 blocks in IEC PAL])
 
@@ -49,7 +48,6 @@ AH_TEMPLATE([HAVE_GTK],
 AH_TEMPLATE([HAVE_LIBXV],
             [Define if you have the `Xv' library (-lXv).])
 
-AC_DEFINE(_GNU_SOURCE)
 
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
Index: libdv-1.0.0/playdv/Makefile.am
===================================================================
--- libdv-1.0.0.orig/playdv/Makefile.am
+++ libdv-1.0.0/playdv/Makefile.am
@@ -15,4 +15,4 @@ bin_PROGRAMS= playdv
 noinst_HEADERS=  display.h oss.h
 
 playdv_SOURCES= playdv.c display.c display.h oss.c
-playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
+playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext