← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to telepathy-yell/m4/tp-compiler-warnings.m4

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
telepathy-yell/m4/tp-compiler-warnings.m4
1
 
dnl TP_COMPILER_WARNINGS(VARIABLE, WERROR_BY_DEFAULT, DESIRABLE, UNDESIRABLE)
2
 
dnl $1 (VARIABLE): the variable to put flags into
3
 
dnl $2 (WERROR_BY_DEFAULT): a command returning true if -Werror should be the
4
 
dnl     default
5
 
dnl $3 (DESIRABLE): warning flags we want (e.g. all extra shadow)
6
 
dnl $4 (UNDESIRABLE): warning flags we don't want (e.g.
7
 
dnl   missing-field-initializers unused-parameter)
8
 
AC_DEFUN([TP_COMPILER_WARNINGS],
9
 
[
10
 
  AC_REQUIRE([AC_ARG_ENABLE])dnl
11
 
  AC_REQUIRE([AC_HELP_STRING])dnl
12
 
  AC_REQUIRE([TP_COMPILER_FLAG])dnl
13
 
 
14
 
  tp_warnings=""
15
 
  for tp_flag in $3; do
16
 
    TP_COMPILER_FLAG([-W$tp_flag], [tp_warnings="$tp_warnings -W$tp_flag"])
17
 
  done
18
 
 
19
 
  tp_error_flags="-Werror"
20
 
  TP_COMPILER_FLAG([-Werror], [tp_werror=yes], [tp_werror=no])
21
 
 
22
 
  for tp_flag in $4; do
23
 
    TP_COMPILER_FLAG([-Wno-$tp_flag],
24
 
      [tp_warnings="$tp_warnings -Wno-$tp_flag"])
25
 
    TP_COMPILER_FLAG([-Wno-error=$tp_flag],
26
 
      [tp_error_flags="$tp_error_flags -Wno-error=$tp_flag"], [tp_werror=no])
27
 
  done
28
 
 
29
 
  AC_ARG_ENABLE([Werror],
30
 
    AC_HELP_STRING([--disable-Werror],
31
 
      [compile without -Werror (normally enabled in development builds)]),
32
 
    tp_werror=$enableval, :)
33
 
 
34
 
  if test "x$tp_werror" = xyes && $2; then
35
 
    $1="$tp_warnings $tp_error_flags"
36
 
  else
37
 
    $1="$tp_warnings"
38
 
  fi
39
 
 
40
 
])