Index: configure --- configure.orig 2006-11-12 05:56:28 +0100 +++ configure 2006-11-12 09:58:43 +0100 @@ -35550,8 +35550,3 @@ { (exit 1); exit 1; }; } fi -if test "x$HAVE_MPEG2_TRUE" = "x#" -then - { echo "$as_me:$LINENO: NOTICE: libmpeg2 not found" >&5 -echo "$as_me: NOTICE: libmpeg2 not found" >&6;} -fi Index: src/main/Makefile.in --- src/main/Makefile.in.orig 2006-11-12 05:56:22 +0100 +++ src/main/Makefile.in 2006-11-12 09:59:41 +0100 @@ -72,6 +72,7 @@ getopt1.$(OBJEXT) extract_OBJECTS = $(am_extract_OBJECTS) extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la +extract_LDFLAGS = -static am_test_binary_OBJECTS = test_binary.$(OBJEXT) test_binary_OBJECTS = $(am_test_binary_OBJECTS) test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la @@ -286,7 +287,8 @@ libextractor.la extract_LDADD = \ - $(top_builddir)/src/main/libextractor.la + $(top_builddir)/src/main/libextractor.la \ + $(top_builddir)/libltdl/libltdl.la @MINGW_FALSE@@SOMEBSD_FALSE@dlflag = -ldl @HAVE_ZLIB_TRUE@zlib = -lz Index: src/plugins/Makefile.in --- src/plugins/Makefile.in.orig 2006-11-12 05:56:23 +0100 +++ src/plugins/Makefile.in 2006-11-12 10:00:14 +0100 @@ -111,7 +111,7 @@ libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS) libextractor_mpeg_la_DEPENDENCIES = am__libextractor_mpeg_la_SOURCES_DIST = mpegextractor.c -@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo +@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS = libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS) libextractor_nsf_la_DEPENDENCIES = \ $(top_builddir)/src/main/libextractor.la @@ -365,12 +365,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -1280,21 +1280,6 @@ install-exec-hook: - mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true - rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \ - rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \ - if test "$(thumbdir)" != ""; then \ - if test "$(thumbqt)" != ""; then \ - $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \ - $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \ - else \ - $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \ - $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \ - fi; \ - else \ - $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \ - $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \ - fi; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: src/plugins/exiv2/Makefile.in --- src/plugins/exiv2/Makefile.in.orig 2006-11-12 05:56:23 +0100 +++ src/plugins/exiv2/Makefile.in 2006-11-12 09:58:43 +0100 @@ -191,12 +191,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/hash/Makefile.in --- src/plugins/hash/Makefile.in.orig 2006-11-12 05:56:23 +0100 +++ src/plugins/hash/Makefile.in 2006-11-12 09:58:43 +0100 @@ -180,12 +180,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/ole2/Makefile.in --- src/plugins/ole2/Makefile.in.orig 2006-11-12 05:56:23 +0100 +++ src/plugins/ole2/Makefile.in 2006-11-12 09:58:43 +0100 @@ -162,12 +162,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/oo/Makefile.in --- src/plugins/oo/Makefile.in.orig 2006-11-12 05:56:24 +0100 +++ src/plugins/oo/Makefile.in 2006-11-12 09:58:43 +0100 @@ -166,12 +166,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/pdf/Makefile.in --- src/plugins/pdf/Makefile.in.orig 2006-11-12 05:56:24 +0100 +++ src/plugins/pdf/Makefile.in 2006-11-12 09:58:43 +0100 @@ -183,12 +183,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/printable/Makefile.in --- src/plugins/printable/Makefile.in.orig 2006-11-12 05:56:25 +0100 +++ src/plugins/printable/Makefile.in 2006-11-12 09:58:43 +0100 @@ -492,12 +492,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/rpm/Makefile.in --- src/plugins/rpm/Makefile.in.orig 2006-11-12 05:56:25 +0100 +++ src/plugins/rpm/Makefile.in 2006-11-12 09:58:43 +0100 @@ -165,12 +165,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ Index: src/plugins/thumbnail/Makefile.in --- src/plugins/thumbnail/Makefile.in.orig 2006-11-12 05:56:25 +0100 +++ src/plugins/thumbnail/Makefile.in 2006-11-12 09:58:43 +0100 @@ -161,12 +161,12 @@ LDFLAGS = @LDFLAGS@ LIBADD_DL = @LIBADD_DL@ LIBEXT = @LIBEXT@ -LIBICONV = @LIBICONV@ +LIBICONV = LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = \ - @LTLIBINTL@ @LIBS@ + @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -271,7 +271,7 @@ $(GLIB_CFLAGS) $(GTK_CFLAGS) libextractor_thumbnailgtk_la_LIBADD = \ - $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \ + $(LIBADD) -lgobject2 @GTK_LIBS@ \ $(top_builddir)/src/main/libextractor.la libextractor_thumbnailgtk_la_LDFLAGS = \