Mercurial > ~mikael > mcabber > hg
comparison mcabber/configure.ac @ 2150:392cf37d5966
Get rid of the libgcrypt explicit dependency
Libotr depends on libgcrypt, but mcabber itself does not, so we don't have
to check for it in the configure script. (Reported by Ryan Schmidt.)
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sun, 17 Aug 2014 17:47:59 +0200 |
| parents | 5150b3bf4c15 |
| children | db6ca1e1e082 |
comparison
equal
deleted
inserted
replaced
| 2149:1b3add57c912 | 2150:392cf37d5966 |
|---|---|
| 201 AC_HELP_STRING([--enable-otr], | 201 AC_HELP_STRING([--enable-otr], |
| 202 [enable OTR (Off-the-Record) messaging support]), | 202 [enable OTR (Off-the-Record) messaging support]), |
| 203 enable_otr=$enableval, | 203 enable_otr=$enableval, |
| 204 otr="") | 204 otr="") |
| 205 if test "x$enable_otr" = "xyes"; then | 205 if test "x$enable_otr" = "xyes"; then |
| 206 # Look for libgcrypt and libotr | 206 # Look for libotr |
| 207 AM_PATH_LIBGCRYPT(1.2.2, [ | 207 AM_PATH_LIBOTR(4.0.0, [ |
| 208 AM_PATH_LIBOTR(4.0.0, [ | 208 AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr]) |
| 209 ], [ | |
| 210 AM_PATH_LIBOTR(3.1.0, [ | |
| 209 AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr]) | 211 AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr]) |
| 212 AC_DEFINE([HAVE_LIBOTR3], 1, [Define if you use libotr v3]) | |
| 210 ], [ | 213 ], [ |
| 211 AM_PATH_LIBOTR(3.1.0, [ | 214 AC_MSG_ERROR(libotr 3.1.0 or newer is required.) |
| 212 AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr]) | |
| 213 AC_DEFINE([HAVE_LIBOTR3], 1, [Define if you use libotr v3]) | |
| 214 ], [ | |
| 215 AC_MSG_ERROR(libotr 3.1.0 or newer is required.) | |
| 216 ]) | |
| 217 ]) | 215 ]) |
| 218 ], [ | |
| 219 AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.) | |
| 220 ]) | 216 ]) |
| 221 fi | 217 fi |
| 222 | 218 |
| 223 # Check for Enchant stuff | 219 # Check for Enchant stuff |
| 224 AC_ARG_ENABLE(enchant, | 220 AC_ARG_ENABLE(enchant, |