← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-07-23 10:41:59 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: james.westby@ubuntu.com-20100723104159-pudrtu70a1svhiyl
Tags: 1.1.1-1+exp1ubuntu1
* Merge from Debian experimental, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.in
937
937
        --disable-mad --disable-libmpeg2 \
938
938
        --disable-faad --disable-skins2 \
939
939
        --disable-live555 \
940
 
        --disable-fribidi --disable-glx
 
940
        --disable-fribidi --disable-glx \
 
941
        --with-kde-solid='$(datadir)/kde4/apps'
941
942
 
942
943
ACLOCAL_AMFLAGS = -I m4
943
944
AUTOMAKE_OPTIONS = \