From 7e6ff1dac82c56bf650fb87afad171b012dcbeb5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 2 Oct 2008 00:23:09 +0000 Subject: [PATCH] Merged revisions 145692 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r145692 | seanbright | 2008-10-01 18:48:16 -0500 (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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@145697 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 84 +++++++++++++++++++++++++++++++++++++++++++++++++--- configure.ac | 28 ++++++++++++++++++ 2 files changed, 108 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b424ca6bd5..557ac8bb43 100755 --- a/configure +++ b/configure @@ -12835,11 +12835,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -12879,11 +12881,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -44935,6 +44939,78 @@ _ACEOF fi +if test "$PBX_GMIME" = "1"; +then + saved_libs="${LIBS}" + saved_cflags="${CFLAGS}" + LIBS="${LIBS} ${GMIME_LIB}" + CFLAGS="${CFLAGS} ${GMIME_INCLUDE}" + { echo "$as_me:$LINENO: checking for g_mime_check_version" >&5 +echo $ECHO_N "checking for g_mime_check_version... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +gboolean q = g_mime_check_version(0,0,0); + ; + return 0; +} + +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_GMIME=1 + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the gmime development package installed." >&5 +echo "$as_me: *** It appears that you do not have the gmime development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${GMIME_DESCRIP} support." >&5 +echo "$as_me: *** Please install it to include ${GMIME_DESCRIP} support." >&6;} + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + PBX_GMIME=0 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="${saved_libs}" + CFLAGS="${saved_cflags}" +fi + if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="" diff --git a/configure.ac b/configure.ac index 33b40a2af4..64ee7fed28 100644 --- a/configure.ac +++ b/configure.ac @@ -1397,6 +1397,34 @@ 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 ], + [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([FREETDS], [sybdb], [dbinit], [sybdb.h]) AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])