← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnome-terminal/quantal

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Rico Tzschichholz, Rico Tzschichholz, Martin Pitt
  • Date: 2011-12-15 15:07:34 UTC
  • mfrom: (1.3.47) (2.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20111215150734-sizp9ugqesip4swb
Tags: 3.2.1-2ubuntu1
https://launchpad.net/bugs/803519
[ Rico Tzschichholz ]
* Sync with debian, remaining changes:
  - debian/control:
    + Build-Depend on liblaunchpad-integration-3.0-dev, dh-autoreconf
      and gnome-common
  - debian/patches:
    + 01_lpi.patch: Launchpad integration patch
    + 01_onlyshowin.patch: Add Unity to OnlyShowIn value (LP: #803519)
    + 02_add_transparency_properties.patch: Allow background
      transparency to be controlled from the GTK theme. Needs rebase
    + 20_add_alt_screen_toggle_ui.patch: Hook new vte
      alternate screen scrolling toggle via UI
    + 50_add_unity_quicklist.patch: Add unity quicklist support
  - debian/rules: Include autoreconf.mk
  - debian/watch: Allow retrieving of unstable releases

[ Martin Pitt ]
* debian/watch: Look for tar.xz tarballs.
* debian/watch: Fix syntax.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
m4_define([gt_version_major],[3])
2
 
m4_define([gt_version_minor],[0])
 
2
m4_define([gt_version_minor],[2])
3
3
m4_define([gt_version_micro],[1])
4
4
m4_define([gt_version_extra],[])
5
5
m4_define([gt_version],[gt_version_major().gt_version_minor().gt_version_micro()gt_version_extra])
46
46
 
47
47
AC_MSG_CHECKING([which gtk+ version to compile against])
48
48
AC_ARG_WITH([gtk],
49
 
  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
 
49
  [AS_HELP_STRING([--with-gtk=3.0],[which gtk+ version to compile against (default: 3.0)])],
50
50
  [case "$with_gtk" in
51
 
     2.0|3.0) ;;
52
 
     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
 
51
     3.0) ;;
 
52
     2.0) AC_MSG_ERROR([unsupported gtk version $with_gtk specified]) ;;
 
53
     *) AC_MSG_ERROR([invalid gtk version $with_gtk specified]) ;;
53
54
   esac],
54
 
  [with_gtk=2.0])
 
55
  [with_gtk=3.0])
55
56
AC_MSG_RESULT([$with_gtk])
56
57
 
57
58
case "$with_gtk" in
58
 
  2.0) GTK_API_VERSION=2.0
59
 
       GTK_REQUIRED=2.18.0
60
 
       VTE_PC_VERSION=
61
 
       VTE_REQUIRED=0.26.0
62
 
       ;;
63
59
  3.0) GTK_API_VERSION=3.0
64
60
       GTK_REQUIRED=3.0.0
65
61
       VTE_PC_VERSION=-2.90
66
 
       VTE_REQUIRED=0.27.3
 
62
       VTE_REQUIRED=0.30.0
67
63
       ;;
68
64
esac
69
65
 
70
66
AC_MSG_CHECKING([for GDK target])
71
67
case "$with_gtk" in
72
 
  2.0) GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" ;;
73
68
  3.0) for target in $($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION); do
74
69
         GDK_TARGET="$target"
75
70
         break