← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
dnl  
2
 
dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
2
dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 
3
dnl  Free Software Foundation, Inc.
3
4
dnl  
4
5
dnl  This program is free software; you can redistribute it and/or modify
5
6
dnl  it under the terms of the GNU General Public License as published by
16
17
dnl  
17
18
 
18
19
AC_PREREQ(2.59c)
19
 
AC_INIT(gnash, 0.8.10dev)
 
20
AC_INIT(gnash, 0.8.10)
20
21
AC_CONFIG_SRCDIR([libcore/as_object.h])
21
22
AC_CONFIG_HEADERS([gnashconfig.h])
22
23
AC_CONFIG_MACRO_DIR([macros])
300
301
cache=yes
301
302
stat_proplookup=no
302
303
AC_ARG_WITH(statistics,
303
 
  AC_HELP_STRING([--with-statistics=], [Specify which statistics features to enable]),
 
304
  AC_HELP_STRING([--with-statistics], [Specify which statistics features to enable]),
304
305
  if test -n ${withval}; then
305
306
    if test "x${withval}" != "xno"; then
306
307
      extlist="${withval}"
402
403
localconnection=yes
403
404
 
404
405
AC_ARG_WITH(security,
405
 
  AC_HELP_STRING([--with-security=], [Specify which security features to enable]),
 
406
  AC_HELP_STRING([--with-security], [Specify which security features to enable]),
406
407
  if test -n ${withval}; then
407
408
    if test "x${withval}" != "xno"; then
408
409
      extlist="${withval}"
503
504
  npapi=no
504
505
else
505
506
  AC_MSG_NOTICE([Configuring Gnash for native compilation])
506
 
  export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
507
507
  export incllist="`eval cat ${srcdir}/macros/incllist`"
508
508
  libslist="`cat ${srcdir}/macros/libslist`"
509
 
  export libslist="${libslist} /lib/${DEB_HOST_MULTIARCH} /usr/lib/${DEB_HOST_MULTIARCH}"
 
509
  if test -f /usr/bin/dpkg-architecture; then
 
510
    export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
 
511
    export libslist="${libslist} /lib/${DEB_HOST_MULTIARCH} /usr/lib/${DEB_HOST_MULTIARCH}"
 
512
  fi
510
513
  export pathlist=$PATH
511
514
fi
512
515
 
563
566
build_aqua=no                   dnl Native MacOSX
564
567
build_dump=no
565
568
AC_ARG_ENABLE(gui,
566
 
  AC_HELP_STRING([--enable-gui=], [Enable support for the specified GUI toolkits (default=gtk,qt4)]),
 
569
  AC_HELP_STRING([--enable-gui], [Enable support for the specified GUI toolkits (default=gtk,qt4)]),
567
570
  [if test -n ${enableval}; then
568
571
    enableval=`echo ${enableval} | tr '\054' ' ' `
569
572
  fi
808
811
dnl By default, don't build any of these, as they are only for the 
809
812
dnl Framebuffer running without X11.
810
813
if test x"${build_fb}" = xyes -a x"${linux}" = xyes; then
811
 
  build_ps2mouse=yes
 
814
  build_ps2mouse=no
812
815
  build_ps2keyboard=yes
813
816
  build_input_events=yes
814
817
  build_tslib=yes
852
855
        build_ps2mouse=yes
853
856
        build_ps2keyboard=yes
854
857
        build_tslib=yes
855
 
        if test x"${build_fb}" = xyes -a x"${linux}" = xyes; then
 
858
        if test x"${linux}" = xyes; then
856
859
          build_input_events=yes
857
860
          input_events="PS/2 Mouse, PS/2 Keyboard, Input Devices, Touchscreen via Tslib"                
858
861
        else
952
955
        build_ogl=yes
953
956
        build_agg=yes
954
957
        build_cairo=yes
955
 
        build_ovg=yes
956
 
        nrender=4
 
958
        build_ovg=no
 
959
        nrender=3
957
960
        ;;
958
961
      ogl|OGL|OpenGL|opengl)
959
962
        renderer_list="${renderer_list} opengl"
1014
1017
dnl instead of the OGL (OpenGL) one. 
1015
1018
build_vaapi_device=no
1016
1019
build_openmax_device=no
1017
 
if test x"${build_ovg}" = xyes; then
1018
 
  build_egl_device=yes
1019
 
else
1020
 
  build_egl_device=no
1021
 
fi
 
1020
build_egl_device=no
1022
1021
build_x11_device=no
1023
1022
build_directfb_device=no
1024
1023
if test x"${build_fb}" = xyes -o x"${build_fb}" = xauto; then
1079
1078
        ndevice=$((ndevice+1))
1080
1079
        ;;
1081
1080
      all|ALL)
1082
 
        device_list="EGL DirectFB X11"
 
1081
        device_list="EGL RawFB X11"
1083
1082
        build_openmax_device=no
1084
1083
        build_vaapi_device=no
1085
1084
        build_egl_device=yes
1086
1085
        build_rawfb_device=yes
1087
1086
        build_directfb_device=no
1088
1087
        build_x11_device=yes
1089
 
        ndevice=5
 
1088
        ndevice=3
1090
1089
        ;;
1091
1090
      op*|Op*|OP*)
1092
1091
        device_list="${device_list} OpenMAX"
1103
1102
  done
1104
1103
)
1105
1104
 
1106
 
dnl Lenny doesn't support this filed for Linux Input events
1107
 
AC_TRY_COMPILE([#include <linux/input.h>], [
1108
 
  struct input_absinfo abs;
1109
 
  abs.resolution = 0;; ],
1110
 
 AC_DEFINE([ABSINFO_RESOLUTION], [1], [ABS Resolution field])
1111
 
)
1112
 
 
1113
1105
if test x"${have_ffmpeg_vaapi}" = x"yes" -a x"${build_vaapi_device}" = x"yes"; then
1114
1106
  use_libva=no
1115
1107
  use_libva_x11=no
1691
1683
dnl copied to the video RAM. This avoids flicker and is faster for complex 
1692
1684
dnl graphics, as video RAM access is usually slower. (strongly suggested)
1693
1685
AC_ARG_ENABLE(doublebuf,
1694
 
  AC_HELP_STRING([--enable-doublebuf], [Enable support for double buffering when rendering]),
 
1686
  AC_HELP_STRING([--disable-doublebuf], [Disble support for double buffering when rendering with AGG]),
1695
1687
  [case "${enableval}" in
1696
1688
    yes) doublebuf=yes ;;
1697
1689
    no)  doublebuf=no ;;
1698
1690
    *)   AC_MSG_ERROR([bad value ${enableval} for enable-doublebuf option]) ;;
1699
 
  esac], doublebuf=no
 
1691
  esac], doublebuf=yes
1700
1692
)
1701
1693
AM_CONDITIONAL(ENABLE_DBUF, [test x"$doublebuf" = xyes])
1702
1694
if test x$doublebuf = xyes; then
1703
 
    AC_DEFINE(ENABLE_DOUBLE_BUFFERING, [1], [Enable double buffering])
 
1695
    AC_DEFINE(ENABLE_DOUBLE_BUFFERING, [1], [Disable double buffering for AGG])
1704
1696
fi
1705
1697
 
1706
1698
dnl --------------------------------------------------------
1874
1866
dnl By default, don't build any of these, as they are only for the Framebuffer
1875
1867
dnl running without X11.
1876
1868
if test x"${build_fb}" = xyes; then
1877
 
  build_ps2mouse=yes
1878
 
  build_ps2keyboard=no
 
1869
  build_ps2mouse=no
 
1870
  build_ps2keyboard=yes
1879
1871
  build_input_events=yes
1880
1872
  build_tslib=yes
1881
 
  input_events="PS/2 Mouse, Input Devices, Touchscreen via Tslib"
 
1873
  input_events="Input Devices, Touchscreen via Tslib"
1882
1874
else
1883
1875
  build_ps2mouse=no
1884
1876
  build_ps2keyboard=no
1887
1879
  input_events=
1888
1880
fi
1889
1881
AC_ARG_ENABLE(input,
1890
 
  AC_HELP_STRING([--enable-input=], [Enable support for the specified input devices for the framebuffer GUI (default=ps2mouse|ps2keyboard|events|touchscreen)]),
 
1882
  AC_HELP_STRING([--enable-input], [Enable support for the specified input devices for the framebuffer GUI (default=ps2mouse|ps2keyboard|events|touchscreen)]),
1891
1883
  [if test -n ${enableval}; then
1892
1884
    enableval=`echo ${enableval} | tr '\054' ' ' `
1893
1885
  fi
2043
2035
 
2044
2036
GNASH_PATH_FIREFOX
2045
2037
 
 
2038
dnl 
 
2039
dnl New versions of the NPAPI require const for this prototype, which currently
 
2040
dnl seems to only be wit Ubuntu Oneiric.
 
2041
AC_MSG_CHECKING([for const needed for NPP_GetMIMEDescription() prototype])
 
2042
npapi_flags="`echo "${NPAPI_CFLAGS}" | sed -e 's/-I//' -e 's/-DXP_UNIX//' | tr -d ' '`/npapi.h"
 
2043
const_test="`grep NPP_GetMIMEDescription ${npapi_flags} | grep -c const`"
 
2044
if test ${const_test} -eq 1; then
 
2045
  AC_DEFINE(NPAPI_CONST, [1], [Newer versions use const in prototypes])
 
2046
  AC_MSG_RESULT([yes])
 
2047
else
 
2048
  AC_MSG_RESULT([no])
 
2049
fi
 
2050
 
 
2051
AC_TRY_COMPILE([#include <linux/input.h>], [
 
2052
  struct input_absinfo abs;
 
2053
  abs.resolution = 0;; ],
 
2054
 AC_DEFINE([ABSINFO_RESOLUTION], [1], [ABS Resolution field])
 
2055
)
 
2056
 
2046
2057
dnl -----------------------------------------------------------------
2047
2058
dnl END OF PLUGIN RELATED STUFF
2048
2059
dnl -----------------------------------------------------------------
2214
2225
  AC_DEFINE(HAVE_LONG_TIMEZONE, [1], [extern timezone is a long integer, not a function])
2215
2226
fi
2216
2227
 
 
2228
AC_CHECK_FUNCS(mkstemps)
2217
2229
AC_CHECK_FUNCS(sysconf)
2218
2230
AC_CHECK_FUNCS(shmget shmat shmdt mmap)
2219
2231
AC_CHECK_FUNCS(scandir)         dnl supported by BSD and Linux, but you never know...
2846
2858
  fi
2847
2859
fi
2848
2860
 
 
2861
dnl ========= Check for GConf
 
2862
 
 
2863
AC_MSG_CHECKING([whether GConf support is requested])
 
2864
AC_ARG_WITH([gconf],
 
2865
  [AS_HELP_STRING([--without-gconf],
 
2866
          [Disable the use of gconf])],
 
2867
  [],
 
2868
  [case "${host}" in
 
2869
    *-cygwin* | *-mingw* | *-pw32*) with_gconf=no ;;
 
2870
    *) with_gconf=yes ;;
 
2871
   esac])
 
2872
AC_MSG_RESULT([$with_gconf])
 
2873
 
 
2874
AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
 
2875
 
 
2876
if test "$with_gconf" = "yes"; then
 
2877
   PKG_CHECK_MODULES([GCONF],[gconf-2.0])
 
2878
   AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
 
2879
 
 
2880
   AM_GCONF_SOURCE_2
 
2881
 
 
2882
   AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
 
2883
   if test "$GCONFTOOL" = "false"; then
 
2884
      AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
 
2885
   fi
 
2886
else
 
2887
   AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false)
 
2888
fi
 
2889
 
 
2890
 
2849
2891
CYGNAL_PATHS
2850
2892
 
2851
2893
SUPPORTED_GUIS=
3244
3286
  DEB_ALTERNATIVE([libgif-dev])
3245
3287
  RPM_INSTALL([libgif-devel])
3246
3288
  RPM_ALTERNATIVE([giflib-devel])
3247
 
  RPM_ALTERNATIVE([libunfif-devel])
 
3289
  RPM_ALTERNATIVE([libungif-devel])
3248
3290
fi
3249
3291
 
3250
3292
if test x"${PNG_LIBS}" != x ; then
3908
3950
  else
3909
3951
    PKG_ERR([No xulrunner development package is installed!])
3910
3952
    PKG_SUGGEST([Install it from http://releases.mozilla.org/pub/mozilla.org/xulrunner])
3911
 
    DEB_INSTALL([xulrunner-dev])
 
3953
    DEB_INSTALL([xulrunner-dev]) or 
 
3954
    DEB_INSTALL([firefox-dev])
3912
3955
    RPM_INSTALL([xulrunner-devel])
3913
3956
  fi
3914
3957
else