acmenc, acmmp3dec, sdp: link to all requires libraries on win32.

Add winsock for windows (for sdp). Link to all the plugins-base
libs we indirectly use for acmmenc and acmmp3dec.

diff --git a/configure.ac b/configure.ac
index e671123b86bcec739686cd5065ca39ef95737490..cbf2c7b1e7eeba51cc86f128b4f2f0d99000aab4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,11 @@ dnl FIXME: maybe move to sys, or make work with winsock2
 AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes)
 AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
 
+if test "x$HAVE_WINSOCK2_H" = "xyes"; then
+  WIN32_LIBS="-lws2_32"
+  AC_SUBST(WIN32_LIBS)
+fi
+
 dnl needed for festival
 AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
 

diff --git a/sys/acmenc/Makefile.am b/sys/acmenc/Makefile.am
index 587868bd5bf5e5ed80e873c2064cc349d6ba6f58..eb1b603a66f0e81b52d3c0f0d3c80ab010fcebd7 100644 (file)
--- a/sys/acmenc/Makefile.am
+++ b/sys/acmenc/Makefile.am
@@ -1,10 +1,16 @@
-plugin_LTLIBRARIES = libgstacmencsink.la\r
-\r
-libgstacmencsink_la_SOURCES = acmenc.c\r
-libgstacmencsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \\r
-       $(GST_PLUGINS_BASE_CFLAGS) $(ACMENC_CFLAGS)\r
-libgstacmencsink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \\r
-       -lgstriff-$(GST_MAJORMINOR) -lmsacm32\r
-libgstacmencsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)\r
-libgstacmencsink_la_LIBTOOLFLAGS = --tag=disable-static\r
-\r
+plugin_LTLIBRARIES = libgstacmenc.la
+
+libgstacmenc_la_SOURCES = acmenc.c
+libgstacmenc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+       $(GST_PLUGINS_BASE_CFLAGS) $(ACMENC_CFLAGS)
+libgstacmenc_la_LIBADD =     \
+    $(GST_BASE_LIBS)             \
+    $(GST_PLUGINS_BASE_LIBS)     \
+    -lgstriff-$(GST_MAJORMINOR)  \
+    -lgstaudio-$(GST_MAJORMINOR) \
+    -lgsttag-$(GST_MAJORMINOR)   \
+    -lmsacm32
+
+libgstacmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstacmenc_la_LIBTOOLFLAGS = --tag=disable-static
+

diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am
index c1a28e75f97b72e47d7a4e015959596dd5469452..27c895c54525a5a45462ab6ec77790a9ce3fbbed 100644 (file)
--- a/sys/acmmp3dec/Makefile.am
+++ b/sys/acmmp3dec/Makefile.am
@@ -1,9 +1,14 @@
-plugin_LTLIBRARIES = libgstacmmp3dec.la\r
-\r
-libgstacmmp3dec_la_SOURCES = acmmp3dec.c\r
-libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \\r
-       $(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS)\r
-libgstacmmp3dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \\r
-       -lgstriff-$(GST_MAJORMINOR) -lmsacm32\r
-libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)\r
-\r
+plugin_LTLIBRARIES = libgstacmmp3dec.la
+
+libgstacmmp3dec_la_SOURCES = acmmp3dec.c
+libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+       $(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS)
+libgstacmmp3dec_la_LIBADD =      \
+    $(GST_BASE_LIBS)             \
+    $(GST_PLUGINS_BASE_LIBS)     \
+    -lgstriff-$(GST_MAJORMINOR)  \
+    -lgstaudio-$(GST_MAJORMINOR) \
+    -lgsttag-$(GST_MAJORMINOR)   \
+    -lmsacm32
+libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
+