← Back to branch summary

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

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-05-26 18:58:51 UTC
  • mfrom: (3.3.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090526185851-t1gun9nboi5kbd9u
Tags: 7.19.5-1ubuntu1
https://launchpad.net/bugs/380281
https://launchpad.net/bugs/379477
* Merge from Debian unstable (LP: #380281), remaining changes:
  - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Call automake-1.9 with --add-missing --copy --force
* Fixes LP: #379477

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
18
18
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19
19
# KIND, either express or implied.
20
20
#
21
 
# $Id: configure.ac,v 1.392 2009-02-13 05:49:58 yangtse Exp $
 
21
# $Id: configure.ac,v 1.410 2009-05-11 00:28:18 yangtse Exp $
22
22
#***************************************************************************
23
23
dnl Process this file with autoconf to produce a configure script.
24
24
 
30
30
CURL_OVERRIDE_AUTOCONF
31
31
 
32
32
dnl configure script copyright
33
 
AC_COPYRIGHT([Copyright (c) 1998 - 2008 Daniel Stenberg, <daniel@haxx.se>
 
33
AC_COPYRIGHT([Copyright (c) 1998 - 2009 Daniel Stenberg, <daniel@haxx.se>
34
34
This configure script may be copied, distributed and modified under the
35
35
terms of the curl license; see COPYING for more details])
36
36
 
498
498
dnl Checks for libraries.
499
499
dnl **********************************************************************
500
500
 
 
501
CURL_CHECK_LIB_XNET
 
502
 
501
503
dnl gethostbyname without lib or in the nsl lib?
502
504
AC_CHECK_FUNC(gethostbyname,
503
505
              [HAVE_GETHOSTBYNAME="1"
1171
1173
    PKGTEST="no"
1172
1174
    PREFIX_OPENSSL=$OPT_SSL
1173
1175
    LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
1174
 
    if [ "$PREFIX_OPENSSL" != "/usr" ] ; then
 
1176
    if test "$PREFIX_OPENSSL" != "/usr" ; then
1175
1177
      LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
1176
1178
      CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
1177
1179
    fi
1494
1496
       dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
1495
1497
       dnl to prevent further configure tests to fail due to this
1496
1498
 
 
1499
       dnl libssh2_version is a post 1.0 addition
 
1500
       AC_CHECK_FUNCS( libssh2_version )
 
1501
 
1497
1502
       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_LIBSSH2"
1498
1503
       export LD_LIBRARY_PATH
1499
1504
       AC_MSG_NOTICE([Added $LIB_LIBSSH2 to LD_LIBRARY_PATH])
1866
1871
AC_HEADER_STDC
1867
1872
 
1868
1873
CURL_CHECK_HEADER_MALLOC
 
1874
CURL_CHECK_HEADER_MEMORY
1869
1875
 
1870
1876
dnl Now check for the very most basic headers. Then we can use these
1871
1877
dnl ones as default-headers when checking for the rest!
1993
1999
#endif
1994
2000
])
1995
2001
 
1996
 
# Check for socklen_t or equivalent
1997
 
CURL_CHECK_TYPE_SOCKLEN_T
 
2002
CURL_CONFIGURE_CURL_SOCKLEN_T
1998
2003
 
1999
2004
TYPE_IN_ADDR_T
2000
2005
 
2099
2104
    ],[
2100
2105
      AC_MSG_RESULT([yes])
2101
2106
      eval "ac_cv_func_$func=yes"
2102
 
      AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$func])], [1],
 
2107
      AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$func]), [1],
2103
2108
        [Define to 1 if you have the $func function.])
2104
2109
    ],[
2105
2110
      AC_MSG_RESULT([but still no])
2545
2550
           packages/Linux/RPM/curl.spec \
2546
2551
           packages/Linux/RPM/curl-ssl.spec \
2547
2552
           packages/Solaris/Makefile \
2548
 
           packages/DOS/Makefile \
2549
2553
           packages/EPM/curl.list \
2550
2554
           packages/EPM/Makefile \
2551
2555
           packages/vms/Makefile \