← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty

« back to all changes in this revision

Viewing changes to m4/curl-confopts.m4

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-10-07 16:53:40 UTC
  • mfrom: (3.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101007165340-3eahi7unrkt7magp
Tags: 7.21.1-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/curl-confopts.m4
21
21
#***************************************************************************
22
22
 
23
23
# File version for 'aclocal' use. Keep it a single number.
24
 
# serial 12
 
24
# serial 13
25
25
 
26
26
dnl CURL_CHECK_OPTION_THREADED_RESOLVER
27
27
dnl -------------------------------------------------
28
28
dnl Verify if configure has been invoked with option
29
 
dnl --enable-threaded-resolver or --disable-threaded-resover, and
 
29
dnl --enable-threaded-resolver or --disable-threaded-resolver, and
30
30
dnl set shell variable want_thres as appropriate.
31
31
 
32
32
AC_DEFUN([CURL_CHECK_OPTION_THREADED_RESOLVER], [
34
34
  OPT_THRES="default"
35
35
  AC_ARG_ENABLE(threaded_resolver,
36
36
AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
37
 
AC_HELP_STRING([--disable-threaded-resover],[Disable threaded resolver]),
 
37
AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
38
38
  OPT_THRES=$enableval)
39
39
  case "$OPT_THRES" in
40
40
    yes)
314
314
 
315
315
AC_DEFUN([CURL_CHECK_OPTION_WARNINGS], [
316
316
  AC_REQUIRE([CURL_CHECK_OPTION_DEBUG])dnl
 
317
  AC_BEFORE([$0],[CURL_CHECK_OPTION_WERROR])dnl
317
318
  AC_BEFORE([$0],[CURL_CHECK_PROG_CC])dnl
318
319
  AC_MSG_CHECKING([whether to enable strict compiler warnings])
319
320
  OPT_COMPILER_WARNINGS="default"
339
340
  AC_MSG_RESULT([$want_warnings])
340
341
])
341
342
 
 
343
dnl CURL_CHECK_OPTION_WERROR
 
344
dnl -------------------------------------------------
 
345
dnl Verify if configure has been invoked with option
 
346
dnl --enable-werror or --disable-werror, and set
 
347
dnl shell variable want_werror as appropriate.
 
348
 
 
349
AC_DEFUN([CURL_CHECK_OPTION_WERROR], [
 
350
  AC_BEFORE([$0],[CURL_CHECK_COMPILER])dnl
 
351
  AC_MSG_CHECKING([whether to enable compiler warnings as errors])
 
352
  OPT_COMPILER_WERROR="default"
 
353
  AC_ARG_ENABLE(werror,
 
354
AC_HELP_STRING([--enable-werror],[Enable compiler warnings as errors])
 
355
AC_HELP_STRING([--disable-werror],[Disable compiler warnings as errors]),
 
356
  OPT_COMPILER_WERROR=$enableval)
 
357
  case "$OPT_COMPILER_WERROR" in
 
358
    no)
 
359
      dnl --disable-werror option used
 
360
      want_werror="no"
 
361
      ;;
 
362
    default)
 
363
      dnl configure option not specified
 
364
      want_werror="no"
 
365
      ;;
 
366
    *)
 
367
      dnl --enable-werror option used
 
368
      want_werror="yes"
 
369
      ;;
 
370
  esac
 
371
  AC_MSG_RESULT([$want_werror])
 
372
])
 
373
 
342
374
 
343
375
dnl CURL_CHECK_NONBLOCKING_SOCKET
344
376
dnl -------------------------------------------------