← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnutls26/trusty

« back to all changes in this revision

Viewing changes to lib/configure.ac

  • Committer: Package Import Robot
  • Author(s): Andreas Metzler
  • Date: 2011-10-01 15:28:13 UTC
  • mfrom: (12.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20111001152813-yygm1c4cxonfxhzy
http://bugs.debian.org/640639
* New upstream version.
  + Allow CA importing of 0 certificates to succeed. Closes: #640639
* Add libp11-kit-dev to libgnutls-dev dependencies. (see #643811)
* [20_guiledocstring.diff] guile: Fix docstring extraction with CPP 4.5+.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/configure.ac
1
1
dnl Process this file with autoconf to produce a configure script.
2
2
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
3
 
# 2009, 2010, 2011 Free Software Foundation, Inc.
 
3
# 2009, 2010 Free Software Foundation, Inc.
4
4
#
5
5
# Author: Nikos Mavrogiannopoulos, Simon Josefsson
6
6
#
22
22
# MA 02110-1301, USA
23
23
 
24
24
AC_PREREQ(2.61)
25
 
AC_INIT([libgnutls], [2.10.5], [bug-gnutls@gnu.org])
 
25
AC_INIT([libgnutls], [2.12.11], [bug-gnutls@gnu.org])
26
26
AC_CONFIG_AUX_DIR([build-aux])
27
27
AC_CONFIG_MACRO_DIR([m4])
28
28
 
29
29
AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
 
30
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
30
31
AM_CONFIG_HEADER(config.h)
31
32
 
32
33
AC_PROG_CC
79
80
 AC_MSG_RESULT(no)
80
81
fi
81
82
 
 
83
PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
 
84
 
82
85
if test x$ac_zlib != xno; then
83
 
  if test "$GNUTLS_REQUIRES_PRIVATE" = ""; then
84
 
    GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
 
86
  if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
 
87
    if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
 
88
      GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
 
89
    else
 
90
      GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
 
91
    fi
85
92
  else
86
 
    GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
 
93
    GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"
87
94
  fi
88
95
fi
89
96
AC_SUBST(GNUTLS_REQUIRES_PRIVATE)
 
97
AC_SUBST(GNUTLS_ZLIB_LIBS_PRIVATE)
 
98
 
 
99
dnl Check for p11-kit
 
100
AC_ARG_WITH(p11-kit,
 
101
        AS_HELP_STRING([--without-p11-kit],
 
102
                [Build without p11-kit and PKCS#11 support]))
 
103
AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
104
if test "$with_p11_kit" != "no"; then
 
105
        PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.4], [with_p11_kit=yes], [with_p11_kit=no])
 
106
        if test "$with_p11_kit" != "no";then
 
107
                AC_DEFINE([ENABLE_PKCS11], 1, [Build PKCS#11 support])
 
108
                CFLAGS="$CFLAGS $P11_KIT_CFLAGS"
 
109
                LIBS="$LIBS $P11_KIT_LIBS"
 
110
                if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
 
111
                        GNUTLS_REQUIRES_PRIVATE="Requires.private: p11-kit-1"
 
112
                else
 
113
                        GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, p11-kit-1"
 
114
                fi
 
115
        else
 
116
                AC_MSG_WARN([[
 
117
*** 
 
118
*** p11-kit was not found. PKCS #11 support will be disabled.
 
119
*** You may get it from http://p11-glue.freedesktop.org/p11-kit.html
 
120
*** ]])
 
121
        fi
 
122
fi
90
123
 
91
124
lgl_INIT
92
125
 
 
126
AC_CHECK_FUNCS(getrusage,,)
 
127
AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
 
128
 
93
129
LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
94
130
LIBGNUTLS_CFLAGS="-I${includedir}"
95
131
AC_SUBST(LIBGNUTLS_LIBS)
102
138
AC_PROG_CXX
103
139
AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no")
104
140
 
105
 
AC_DEFINE([GNUTLS_COMPAT_H], 1, [Make sure we don't use old features in code.])
 
141
AC_DEFINE([GNUTLS_INTERNAL_BUILD], 1, [We allow temporarily usage of deprecated functions - until they are removed.])
106
142
 
107
143
AC_CONFIG_FILES([
108
144
  Makefile
116
152
  openpgp/Makefile
117
153
  po/Makefile.in
118
154
  x509/Makefile
 
155
  gcrypt/Makefile
 
156
  nettle/Makefile
119
157
])
120
158
AC_OUTPUT