← Back to branch summary

~ubuntu-branches/ubuntu/precise/vlc/precise-proposed

« back to all changes in this revision

Viewing changes to .pc/bp-xulrunner-npapi-mime.patch/configure.ac

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2011-12-31 13:42:26 UTC
  • mfrom: (3.5.31 sid)
  • Revision ID: package-import@ubuntu.com-20111231134226-nwo5aheq7d03wooa
http://bugs.debian.org/604687
http://bugs.debian.org/651662
* New upstream release (Closes: #604687).
* Drop backported patches and patches that were accepted by upstream.
* Refresh remaining patches.
* Add mailcap entry for Ogg Video (Closes: #651662).

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/bp-xulrunner-npapi-mime.patch/configure.ac
2
2
 
3
3
AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
4
4
 
5
 
AC_INIT(vlc, 1.1.12)
 
5
AC_INIT(vlc, 1.1.13)
6
6
VERSION_MAJOR="1"
7
7
VERSION_MINOR="1"
8
 
VERSION_REVISION="12"
 
8
VERSION_REVISION="13"
9
9
VERSION_EXTRA="-git"
10
10
PKGDIR="vlc"
11
11
AC_SUBST(PKGDIR)
4160
4160
then
4161
4161
  AC_CHECK_HEADERS(xosd.h,
4162
4162
    AC_CHECK_LIB(xosd, xosd_set_horizontal_offset, [
4163
 
      VLC_ADD_PLUGIN([xosd])
4164
 
      VLC_ADD_LIBS([xosd],[-lxosd])
 
4163
      AS_IF([test "${no_x}" != "yes"], [
 
4164
          VLC_ADD_PLUGIN([xosd])
 
4165
          VLC_ADD_LIBS([xosd],[-lxosd ${X_LIBS} ${X_PRE_LIBS} -lX11])
 
4166
          VLC_ADD_CFLAGS([xosd],[${X_CFLAGS}])
 
4167
        ],[
 
4168
          AC_MSG_ERROR([Xlib is required with xosd.])
 
4169
        ])
4165
4170
    ])
4166
4171
  )
4167
4172
fi