← Back to branch summary

~ubuntu-branches/ubuntu/karmic/vlc/karmic

« back to all changes in this revision

Viewing changes to m4/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy)
  • Date: 2009-04-06 13:58:06 UTC
  • mfrom: (1.1.21 upstream) (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090406135806-96lmh2oslltinvi7
Tags: 0.9.9a-1ubuntu1
https://launchpad.net/bugs/356310
https://launchpad.net/bugs/320915
* Merge from Debian. (LP: #356310)
* Remaining changes:
  - build against libxul-dev instead of iceape-dev
  - build against libass-dev and libx264-dev
  - build against and install libx264 plugin
  - adjust Vcs-Bzr Headers in debian/control
  - add Xb-Npp header to vlc package
  - debian/patches/301_DVD_media.diff: Change %U to %f
     in VLC .desktop file, cf LP #275043
  - Remove arts from dependencies. (LP: #320915)
    - debian/control:
      - Remove libarts1-dev from build depends
      - Don't build package vlc-plugin-arts
      - Remove all notions of vlc-plugin-arts from packages descriptions
    - debian/rules:
      - Remove --enable-arts from confflags
    - Delete debian/vlc-plugin-arts.install
    - Delete debian/vlc-plugin-arts.links

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/Makefile.in
169
169
LIBTOOL = @LIBTOOL@
170
170
LIBV4L2_CFLAGS = @LIBV4L2_CFLAGS@
171
171
LIBV4L2_LIBS = @LIBV4L2_LIBS@
 
172
LIPO = @LIPO@
172
173
LN_S = @LN_S@
173
174
LTLIBICONV = @LTLIBICONV@
174
175
LTLIBINTL = @LTLIBINTL@
488
489
OBJEXT = @OBJEXT@
489
490
OPENCV_CFLAGS = @OPENCV_CFLAGS@
490
491
OPENCV_LIBS = @OPENCV_LIBS@
 
492
OTOOL = @OTOOL@
 
493
OTOOL64 = @OTOOL64@
491
494
PACKAGE = @PACKAGE@
492
495
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
493
496
PACKAGE_NAME = @PACKAGE_NAME@
607
610
srcdir = @srcdir@
608
611
sysconfdir = @sysconfdir@
609
612
target_alias = @target_alias@
 
613
top_build_prefix = @top_build_prefix@
610
614
top_builddir = @top_builddir@
611
615
top_srcdir = @top_srcdir@
612
616
NULL =