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

[SVN commits to the Digium repositories]

Author: seanbright
Date: Thu Oct  2 10:30:52 2008
New Revision: 145781

URL: http://svn.digium.com/view/asterisk?view=rev&rev=145781
Log:
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.
........

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=145781&r1=145780&r2=145781
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Thu Oct  2 10:30:52 2008
@@ -1435,35 +1435,7 @@
     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], [])