~ubuntu-branches/ubuntu/maverick/curl/maverick

« back to all changes in this revision

Viewing changes to lib/version.c

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-12-11 19:33:21 UTC
  • mfrom: (3.4.2 squeeze) (40.1.2 curl)
  • Revision ID: james.westby@ubuntu.com-20091211193321-tenukopudyznzbjj
* Merge with Debian testing.  Remaining changes:
  - Keep build deps in main:
    - 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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: version.c,v 1.60 2009-03-13 09:58:15 bagder Exp $
 
21
 * $Id: version.c,v 1.61 2009-06-10 02:49:43 yangtse Exp $
22
22
 ***************************************************************************/
23
23
 
24
24
#include "setup.h"
188
188
#ifdef HAVE_GSSAPI
189
189
  | CURL_VERSION_GSSNEGOTIATE
190
190
#endif
 
191
#ifdef DEBUGBUILD
 
192
  | CURL_VERSION_DEBUG
 
193
#endif
191
194
#ifdef CURLDEBUG
192
 
  | CURL_VERSION_DEBUG
 
195
  | CURL_VERSION_CURLDEBUG
193
196
#endif
194
197
#ifdef USE_ARES
195
198
  | CURL_VERSION_ASYNCHDNS