diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-03-30 21:07:51 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-03-30 21:07:51 +0000 |
| commit | 1795cc02155b2cea8f14381a0b73f00bea38ec96 (patch) | |
| tree | 3f83bea60755d8cf7df6f87ee89a6f64df99d104 | |
| parent | 9b36e243ae8da90d1be4b0aa5f9f119f322fb825 (diff) | |
| download | gstreamer-plugins-base-1795cc02155b2cea8f14381a0b73f00bea38ec96.tar.gz | |
alphabetization fixen a jack caps fix
Original commit message from CVS:
* alphabetization fixen
* a jack caps fix
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | ext/Makefile.am | 10 |
2 files changed, 16 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 28a72cc37..b4181171f 100644 --- a/configure.ac +++ b/configure.ac @@ -432,14 +432,6 @@ GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [ AC_SUBST(GST_HTTPSRC_GET_TYPE) ]) -dnl *** libcolorspace *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LCS, true) -GST_CHECK_FEATURE(LCS, Lcs, lcs, [ - PKG_CHECK_MODULES(LCS, lcs, HAVE_LCS="yes", HAVE_LCS="no") - AC_SUBST(LCS_CFLAGS) - AC_SUBST(LCS_LIBS) -]) - dnl *** Jack *** translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) GST_CHECK_FEATURE(JACK, Jack, jack, [ @@ -464,6 +456,14 @@ GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" ]) AC_SUBST(LAME_LIBS) +dnl *** libcolorspace *** +translit(dnm, m, l) AM_CONDITIONAL(USE_LCS, true) +GST_CHECK_FEATURE(LCS, Lcs, lcs, [ + PKG_CHECK_MODULES(LCS, lcs, HAVE_LCS="yes", HAVE_LCS="no") + AC_SUBST(LCS_CFLAGS) + AC_SUBST(LCS_LIBS) +]) + dnl FIXME : check if these CPP flags can be dealt with otherwise dnl libdvcheck_save_CPPFLAGS="$CPPFLAGS" dnl CPPFLAGS="$CPPFLAGS $GST_CFLAGS" diff --git a/ext/Makefile.am b/ext/Makefile.am index 39e6a9862..a003181d9 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -120,6 +120,12 @@ else LAME_DIR= endif +if USE_LCS +LCS_DIR=lcs +else +LCS_DIR= +endif + if USE_MAD MAD_DIR=mad else @@ -210,7 +216,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ - $(LADSPA_DIR) $(LAME_DIR) \ + $(LADSPA_DIR) $(LAME_DIR) $(LCD_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ @@ -223,7 +229,7 @@ DIST_SUBDIRS=\ dvdread esd festival \ flac gnomevfs gsm \ hermes http jack jpeg \ - ladspa lame \ + ladspa lame lcs \ mad mikmod mjpegtools mpeg2dec \ openquicktime raw1394 rtp \ sdl shout sidplay \ |