diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-30 16:50:40 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-30 16:50:40 +0000 |
| commit | aac18414b239e5b5d966f8cdc11bbbb09fe7b1ff (patch) | |
| tree | 3c6a35bcfd66f9501d7cd8f660deeb11959456a7 | |
| parent | f7caee1a45a3ff45a394a63ac1b6d65a5873d8b3 (diff) | |
Tweak the configure script so that error output isn't spewed to the console
when searching for GTK2 libs, and they aren't found.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@72766 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 72489 . +# From configure.ac Revision: 72597 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -11849,11 +11849,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> +#include <sys/types.h> /* for off_t */ + #include <stdio.h> 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; } @@ -11893,11 +11895,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <stdio.h> +#include <sys/types.h> /* for off_t */ + #include <stdio.h> 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; } @@ -30946,7 +30950,7 @@ else fi if test ! "x${PKGCONFIG}" = xNo; then - GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags) + GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) PBX_GTK2=1 diff --git a/configure.ac b/configure.ac index 2cbb48a27..f619a853e 100644 --- a/configure.ac +++ b/configure.ac @@ -1131,7 +1131,7 @@ AC_SUBST(GTK_LIB) PBX_GTK2=0 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) if test ! "x${PKGCONFIG}" = xNo; then - GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags) + GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) PBX_GTK2=1 AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.]) |