← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gxine/utopic-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2014-05-07 21:34:55 UTC
  • mfrom: (2.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20140507213455-qnu5diwyyj8bkaap
Tags: 0.5.907-3ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/rules, debian/control: use dh-autoreconf at build time.
  - debian/control: Add Xb-Npp-xxx, Xb-Npp-Description and Xb-Npp-File
    fields.
  - src/script_engine.c: fix a remaining memory leak issue associated with
    using JS_EncodeString(), which somehow didn't get fixed upstream
  - debian/gxineplugin.links: Add a link to xulrunner-addons/plugins
    directory.
  - mime.default: Add dvd, vcd, svcd tags.
* Dropped changes, no longer needed:
  - debian/gxine.install: no need to diverge from Debian since we no longer
    ship a wrapper
* All other changes dropped, as they have been included upstream or in
  Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
AC_PREREQ(2.59)
2
 
AC_INIT([gxine], [0.5.905])
 
2
AC_INIT([gxine], [0.5.907])
3
3
AC_CONFIG_SRCDIR([src/main.c])
4
4
 
5
5
AC_CONFIG_HEADERS([include/config.h])
7
7
AM_MAINTAINER_MODE
8
8
dnl AM_ACLOCAL_INCLUDE(m4)
9
9
 
 
10
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
11
 
10
12
AC_GNU_SOURCE
11
13
 
12
14
XINE_LIB_MIN_VER=1.1.8
73
75
AM_GNU_GETTEXT([external])
74
76
 
75
77
dnl ---------------------------------------------
76
 
dnl libm, libdl
77
 
dnl ---------------------------------------------
78
 
AC_CHECK_LIB(m, round, [], [], [-lm])
79
 
AC_CHECK_LIB(dl, dlsym, [], [], [-ldl])
80
 
 
81
 
dnl ---------------------------------------------
82
78
dnl Checks for X11 and Xcb
83
79
dnl ---------------------------------------------
84
80
 
342
338
AM_PATH_XINE([$XINE_LIB_MIN_VER],, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
343
339
 
344
340
dnl Check for xine-list-* (MIME types)
345
 
XINE_LIST="$(xine-config --xine-list 2>/dev/null)"
 
341
XINE_LIST="$(pkg-config --variable=xine_list libxine 2>/dev/null || xine-config --xine-list 2>/dev/null)"
346
342
AM_CONDITIONAL([XINE_LIST], [test "$XINE_LIST" != ''])
347
343
AC_SUBST(XINE_LIST)
348
344
 
417
413
  AC_MSG_WARN([logo format "$logo_sub" cannot be displayed - demuxer not present])
418
414
fi
419
415
 
 
416
XINE_LIB_SHIMS
 
417
 
420
418
dnl ---------------------------------------------
421
419
dnl Check for lirc
422
420
dnl ---------------------------------------------
455
453
AM_CONDITIONAL(HAVE_GETOPT_LONG, test x"$ac_getopt_long" = "xyes")
456
454
 
457
455
dnl ---------------------------------------------
 
456
dnl That nice stable libmozjs API... :-(
 
457
dnl ---------------------------------------------
 
458
GXINE_JS_CHECK_TYPES
 
459
 
 
460
dnl ---------------------------------------------
458
461
dnl Miscellaneous build flags
459
462
dnl ---------------------------------------------
460
463