← Back to branch summary

~ubuntu-branches/ubuntu/precise/wget/precise-proposed

« back to all changes in this revision

Viewing changes to m4/error.m4

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-10-19 00:00:09 UTC
  • mfrom: (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20111019000009-8p33w3wz4b1rdri0
Tags: 1.13-1ubuntu1
https://launchpad.net/bugs/503339
* Merge from Debian unstable, remaining changes:
  - Add wget-udeb to ship wget.gnu as alternative to busybox wget
    implementation.
  - Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
* Dropped changes, superseded in Debian:
  - Keep build dependencies in main:
    + debian/control: remove info2man build-dep
    + debian/patches/series: disable wget-infopod_generated_manpage
  - Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
    can depend on it.
* Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb for
  it.
* Add a second build pass for the udeb, so we can build without libidn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/error.m4
1
 
#serial 11
 
1
#serial 14
2
2
 
3
 
# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2009 Free
4
 
# Software Foundation, Inc.
 
3
# Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc.
5
4
#
6
5
# This file is free software; the Free Software Foundation
7
6
# gives unlimited permission to copy and/or distribute it,
9
8
 
10
9
AC_DEFUN([gl_ERROR],
11
10
[
12
 
  AC_FUNC_ERROR_AT_LINE
13
 
  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
14
 
  gl_PREREQ_ERROR
 
11
  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
 
12
  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
 
13
  AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
 
14
    [AC_LINK_IFELSE(
 
15
       [AC_LANG_PROGRAM(
 
16
          [[#include <error.h>]],
 
17
          [[error_at_line (0, 0, "", 0, "an error occurred");]])],
 
18
       [ac_cv_lib_error_at_line=yes],
 
19
       [ac_cv_lib_error_at_line=no])])
15
20
])
16
21
 
17
22
# Prerequisites of lib/error.c.
18
23
AC_DEFUN([gl_PREREQ_ERROR],
19
24
[
20
25
  AC_REQUIRE([AC_FUNC_STRERROR_R])
 
26
  AC_REQUIRE([AC_C_INLINE])
21
27
  :
22
28
])