Mercurial > ~mikael > mcabber > hg
comparison mcabber/configure.ac @ 1586:590ade2780bd
Use pkg-config to detect GnuTLS instead of the m4 macros
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 04 Oct 2009 18:12:38 +0200 |
parents | c431fa9e2876 |
children | 8d1bcc83ae32 |
comparison
equal
deleted
inserted
replaced
1585:da6a359c8a03 | 1586:590ade2780bd |
---|---|
191 AC_CHECK_LIB(crypto, main) | 191 AC_CHECK_LIB(crypto, main) |
192 AC_CHECK_LIB(ssl, main) | 192 AC_CHECK_LIB(ssl, main) |
193 else | 193 else |
194 AC_MSG_RESULT([not found or disabled]) | 194 AC_MSG_RESULT([not found or disabled]) |
195 | 195 |
196 AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ | 196 PKG_PROG_PKG_CONFIG |
197 PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], | |
198 have_gnutls=yes, have_gnutls=no) | |
199 if test "$have_gnutls" = "yes"; then | |
200 AC_DEFINE([HAVE_GNUTLS], 1, [GNU TLS]) | |
197 CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" | 201 CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" |
198 LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra -lgnutls-openssl" | 202 LIBS="$LIBS $LIBGNUTLS_LIBS" |
199 AC_DEFINE([HAVE_GNUTLS], [], [GNU TLS]) | 203 fi |
200 ]) | |
201 fi | 204 fi |
202 fi | 205 fi |
203 | 206 |
204 # Check for Aspell stuff | 207 # Check for Aspell stuff |
205 AC_ARG_ENABLE(aspell, [ --enable-aspell enable aspell support], | 208 AC_ARG_ENABLE(aspell, [ --enable-aspell enable aspell support], |