aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-02 15:30:52 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-02 15:30:52 +0000
commit92fe2dcb4ffe5b976941284c49adb83d2e4223f6 (patch)
tree765cdc750031e1f0e8982485b207dbbdc818c6ab /configure.ac
parentb8dca00296c36820cac98ccf9a8f3b2ff2dee037 (diff)
Merged revisions 145771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r145771 | seanbright | 2008-10-02 11:28:48 -0400 (Thu, 02 Oct 2008) | 1 line This is much cleaner, methinks. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@145781 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac30
1 files changed, 1 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 337f6aa81..1b75f31d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1435,35 +1435,7 @@ then
AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
fi
-AST_EXT_TOOL_CHECK([GMIME], [gmime])
-
-if test "$PBX_GMIME" = "1";
-then
- saved_libs="${LIBS}"
- saved_cflags="${CFLAGS}"
- LIBS="${LIBS} ${GMIME_LIB}"
- CFLAGS="${CFLAGS} ${GMIME_INCLUDE}"
- AC_MSG_CHECKING(for g_mime_check_version)
- AC_LINK_IFELSE(
- [
- AC_LANG_PROGRAM(
- [#include <gmime/gmime.h>],
- [gboolean q = g_mime_check_version(0,0,0);])
- ],
- [ AC_MSG_RESULT(yes)
- PBX_GMIME=1
- ],
- [ AC_MSG_RESULT(no)
- AC_MSG_NOTICE([***])
- AC_MSG_NOTICE([*** It appears that you do not have the gmime development package installed.])
- AC_MSG_NOTICE([*** Please install it to include ${GMIME_DESCRIP} support.])
- AC_MSG_NOTICE([***])
- PBX_GMIME=0
- ]
- )
- LIBS="${saved_libs}"
- CFLAGS="${saved_cflags}"
-fi
+AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])