← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gnupg2/jaunty-security

« back to all changes in this revision

Viewing changes to m4/gettext.m4

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2008-04-28 03:22:20 UTC
  • mfrom: (1.1.10 upstream)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20080428032220-a8rl6klzavd4nvr4
Tags: 2.0.9-2
http://bugs.debian.org/459462
http://bugs.debian.org/477691
http://bugs.debian.org/462951
http://bugs.debian.org/476999
* The "I've neglected you too long" release.

* debian/control: 
  - Add recommends on gnupg-agent for gpgsm and gnupg2, since they need 
    it under most circumstances. (Closes: #459462, #477691)
  - Depend on pinentry instead of recommend, and move pinentry-gtk2 to the 
    front of the alternatives list. (Closes: #462951)
* keyserver/gpgkeys_curl.c, keyserver/gpgkeys_hkp.c: Fix FTBFS with gcc
  4.3 strictness on bitfields combined with curl. (Closes: #476999)

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/gettext.m4
1
 
# gettext.m4 serial 59 (gettext-0.16.1)
2
 
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 
1
# gettext.m4 serial 60 (gettext-0.17)
 
2
dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
3
3
dnl This file is free software; the Free Software Foundation
4
4
dnl gives unlimited permission to copy and/or distribute it,
5
5
dnl with or without modifications, as long as this notice is preserved.
362
362
])
363
363
 
364
364
 
365
 
dnl Checks for special options needed on MacOS X.
366
 
dnl Defines INTL_MACOSX_LIBS.
367
 
AC_DEFUN([gt_INTL_MACOSX],
368
 
[
369
 
  dnl Check for API introduced in MacOS X 10.2.
370
 
  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
371
 
    gt_cv_func_CFPreferencesCopyAppValue,
372
 
    [gt_save_LIBS="$LIBS"
373
 
     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
374
 
     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
375
 
       [CFPreferencesCopyAppValue(NULL, NULL)],
376
 
       [gt_cv_func_CFPreferencesCopyAppValue=yes],
377
 
       [gt_cv_func_CFPreferencesCopyAppValue=no])
378
 
     LIBS="$gt_save_LIBS"])
379
 
  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
380
 
    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
381
 
      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
382
 
  fi
383
 
  dnl Check for API introduced in MacOS X 10.3.
384
 
  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
385
 
    [gt_save_LIBS="$LIBS"
386
 
     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
387
 
     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
388
 
       [gt_cv_func_CFLocaleCopyCurrent=yes],
389
 
       [gt_cv_func_CFLocaleCopyCurrent=no])
390
 
     LIBS="$gt_save_LIBS"])
391
 
  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
392
 
    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
393
 
      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
394
 
  fi
395
 
  INTL_MACOSX_LIBS=
396
 
  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
397
 
    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
398
 
  fi
399
 
  AC_SUBST([INTL_MACOSX_LIBS])
400
 
])
401
 
 
402
 
 
403
365
dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
404
366
m4_define([gt_NEEDS_INIT],
405
367
[