[svn-commits] seanbright: branch 1.6.1 r145694 - in /branches/1.6.1: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Oct  1 18:54:44 2008
New Revision: 145694

URL: http://svn.digium.com/view/asterisk?view=rev&rev=145694
Log:
Merged revisions 145692 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r145692 | seanbright | 2008-10-01 19:48:16 -0400 (Wed, 01 Oct 2008) | 7 lines

Try a test compile using the GMime library.  Some distros install gmime-config
in the base package instead of the -devel package.  Now we print a notice and
disable GMime support instead of bombing during the main compilation.

(closes issue #13583)
Reported by: arkadia

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configure
    branches/1.6.1/configure.ac

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=145694&r1=145693&r2=145694
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Wed Oct  1 18:54:44 2008
@@ -1437,6 +1437,34 @@
 
 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_LIB_CHECK([HOARD], [hoard], [malloc], [])
 
 AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h])