← Back to branch summary

~ubuntu-branches/ubuntu/saucy/curl/saucy-security

« back to all changes in this revision

Viewing changes to .pc/gnutls/configure.ac

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2011-11-25 17:30:45 UTC
  • mfrom: (3.4.23 sid)
  • Revision ID: package-import@ubuntu.com-20111125173045-2l3ni88jv16kath0
Tags: 7.22.0-3ubuntu1
* Merge from Debian unstable, remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/gnutls/configure.ac
314
314
  supports_unittests=no
315
315
fi
316
316
 
 
317
# IRIX 6.5.24 gcc 3.3 autobuilds fail unittests library compilation due to
 
318
# a problem related with OpenSSL headers and library versions not matching.
 
319
# Disable unit tests while time to further investigate this is found.
 
320
case $host in
 
321
  mips-sgi-irix6.5)
 
322
    if test "$compiler_id" = "GNU_C"; then
 
323
      supports_unittests=no
 
324
    fi
 
325
    ;;
 
326
esac
 
327
 
 
328
# All AIX autobuilds fails unit tests linking against unittests library
 
329
# due to unittests library being built with no symbols or members. Libtool ?
 
330
# Disable unit tests while time to further investigate this is found.
 
331
case $host_os in
 
332
  aix*)
 
333
    supports_unittests=no
 
334
    ;;
 
335
esac
 
336
 
317
337
dnl Build unit tests when option --enable-debug is given.
318
338
if test "x$want_debug" = "xyes" &&
319
339
   test "x$supports_unittests" = "xyes"; then
1331
1351
    dnl the user told us to look
1332
1352
    OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
1333
1353
    AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"])
1334
 
    if test -e "$OPENSSL_PCDIR/openssl.pc"; then
 
1354
    if test -f "$OPENSSL_PCDIR/openssl.pc"; then
1335
1355
      PKGTEST="yes"
1336
1356
    fi
1337
1357
 
2466
2486
        stdbool.h \
2467
2487
        arpa/tftp.h \
2468
2488
        sys/filio.h \
 
2489
        sys/wait.h \
2469
2490
        setjmp.h,
2470
2491
dnl to do if not found
2471
2492
[],
2611
2632
CURL_CHECK_FUNC_SIGNAL
2612
2633
CURL_CHECK_FUNC_SIGSETJMP
2613
2634
CURL_CHECK_FUNC_SOCKET
 
2635
CURL_CHECK_FUNC_SOCKETPAIR
2614
2636
CURL_CHECK_FUNC_STRCASECMP
2615
2637
CURL_CHECK_FUNC_STRCASESTR
2616
2638
CURL_CHECK_FUNC_STRCMPI
2841
2863
       AC_MSG_RESULT(yes)
2842
2864
)
2843
2865
 
 
2866
CURL_CHECK_OPTION_NTLM_WB
 
2867
 
 
2868
CURL_CHECK_NTLM_WB
 
2869
 
2844
2870
dnl ************************************************************
2845
2871
dnl disable TLS-SRP authentication
2846
2872
dnl
3016
3042
  if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \
3017
3043
      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then
3018
3044
    SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"
 
3045
    if test "x$NTLM_WB_ENABLED" = "x1"; then
 
3046
      SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM_WB"
 
3047
    fi
3019
3048
  fi
3020
3049
fi
3021
3050
if test "x$USE_TLS_SRP" = "x1"; then