From 96c92bcd8163cd41359f2ce50d7be48f17650832 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 1 Apr 2006 15:30:56 +0000 Subject: [PATCH] disable use of AS_LIBTOOL_TAGS, it doesn't work correctly Original commit message from CVS: disable use of AS_LIBTOOL_TAGS, it doesn't work correctly --- common | 2 +- configure.ac | 6 +++++- ext/sidplay/Makefile.am | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common b/common index 6850ec3..6f7101e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6850ec3d1c74ff309330c3410c3fce3d947986ca +Subproject commit 6f7101e2227975fa8a134358362dd4b55e326b4c diff --git a/configure.ac b/configure.ac index 00a48bb..ae1b6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,11 @@ dnl we override it here if we need to for the release candidate of new series GST_MAJORMINOR=0.10 AC_SUBST(GST_MAJORMINOR) -AS_LIBTOOL_TAGS +dnl FIXME: this macro doesn't actually work; +dnl the generated libtool script has no support for the listed tags. +dnl So this needs to be fixed first if we want to use this +dnl AS_LIBTOOL_TAGS([CXX]) + AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am index cbd1f5e..9bfceb2 100644 --- a/ext/sidplay/Makefile.am +++ b/ext/sidplay/Makefile.am @@ -1,8 +1,8 @@ plugin_LTLIBRARIES = libgstsid.la libgstsid_la_SOURCES = gstsiddec.cc -libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS) $(GST_PLUGINS_CFLAGS) -libgstsid_la_LIBADD = $(SIDPLAY_LIBS) $(GST_PLUGINS_LIBS) +libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS) +libgstsid_la_LIBADD = $(SIDPLAY_LIBS) $(GST_PLUGINS_BASE_LIBS) libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstsiddec.h -- 2.7.4