5 files changed, 16 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index e16dc673..26dbfd56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,9 +436,10 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_in
 dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 
 dnl *** dvdread ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDVDREAD, true)
-GST_CHECK_FEATURE(LIBDVDREAD, [dvdread library], libdvdread, [
-  GST_CHECK_LIBHEADER(LIBDVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, LIBDVDREAD_LIBS="-ldvdread")
+translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true)
+GST_CHECK_FEATURE(DVDREAD, [dvdread library], libdvdread, [
+  GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread")
+  AC_SUBST(DVDREAD_LIBS)
 ])
 
 dnl **** ESound ****
@@ -860,10 +861,6 @@ if test "x$HAVE_LIBHERMES" = "xyes"; then
   AC_DEFINE(HAVE_LIBHERMES)
 fi
 
-if test "x$HAVE_LIBDVDREAD" = xyes; then
-  AC_DEFINE(HAVE_LIBDVDREAD)
-fi
-
 if test "x$HAVE_A52DEC" = xyes; then
   AC_DEFINE(HAVE_A52DEC)
 fi
@@ -895,7 +892,6 @@ AM_CONDITIONAL(EXPERIMENTAL,        test "$EXPERIMENTAL" = "$xyes")
 AM_CONDITIONAL(BROKEN,              test "$BROKEN" = "$xyes")
 
 AM_CONDITIONAL(HAVE_LIBMIKMOD,      test "x$HAVE_LIBMIKMOD" = "xyes")
-AM_CONDITIONAL(HAVE_LIBDVDREAD,     test "x$HAVE_LIBDVDREAD" = "xyes")
 AM_CONDITIONAL(HAVE_LIBJPEG,        test "x$HAVE_LIBJPEG" = "xyes")
 AM_CONDITIONAL(HAVE_LIBSDL,         test "x$HAVE_LIBSDL" = "xyes")
 AM_CONDITIONAL(HAVE_LIBHERMES,      test "x$HAVE_LIBHERMES" = "xyes")
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 87883f3c..fef6dfd4 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -22,6 +22,12 @@ else
 AUDIOFILE_DIR=
 endif
 
+if USE_DVDREAD
+DVDREAD_DIR=dvdread
+else
+DVDREAD_DIR=
+endif
+
 if USE_ESD
 ESD_DIR=esd
 else
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 433c4fd0..27655437 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -1,6 +1,6 @@
-## libdir = $(libdir)/gst
+librarydir = $(libdir)/gst
 
-lib_LTLIBRARIES = libgstaudio.la
+library_LTLIBRARIES = libgstaudio.la
 
 libgstaudio_la_SOURCES = audio.c
 
diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am
index 785abceb..15310d76 100644
--- a/gst-libs/gst/resample/Makefile.am
+++ b/gst-libs/gst/resample/Makefile.am
@@ -1,6 +1,6 @@
-## libdir = $(libdir)/gst
+librarydir = $(libdir)/gst
 
-lib_LTLIBRARIES = libgstresample.la
+library_LTLIBRARIES = libgstresample.la
 
 if HAVE_CPU_I386
 ARCHCFLAGS = -march=i486
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index ba4a17ba..adfc3f66 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -1,6 +1,6 @@
-libdir = $(prefix)/lib/gst
+librarydir = $(prefix)/lib/gst
 
-lib_LTLIBRARIES = libgstriff.la
+library_LTLIBRARIES = libgstriff.la
 
 libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c