merge of '49118a4c6035353c0f8cf1aa30297dd36e43241f'
[vuplus_openembedded] / packages / pulseaudio / pulseaudio-0.9.10 / libiconv.patch
1 Index: pulseaudio-0.9.10/src/Makefile.am
2 ===================================================================
3 --- pulseaudio-0.9.10.orig/src/Makefile.am      2008-07-20 13:16:51.548858829 +0200
4 +++ pulseaudio-0.9.10/src/Makefile.am   2008-07-20 13:43:39.842031837 +0200
5 @@ -551,7 +551,7 @@
6  
7  libpulse_la_CFLAGS = $(AM_CFLAGS)
8  libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
9 -libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
10 +libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV)
11  
12  if HAVE_X11
13  libpulse_la_CFLAGS += $(X_CFLAGS)
14 @@ -771,7 +771,7 @@
15  
16  libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
17  libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
18 -libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
19 +libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
20  
21  ###################################
22  #   Plug-in support libraries     #