From: Joshua Colp Date: Wed, 11 Jul 2007 17:06:54 +0000 (+0000) Subject: Merged revisions 74572 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2088 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d3f9ce25b77693dcc4c28cb7e6bd24b14593276;p=thirdparty%2Fasterisk.git Merged revisions 74572 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r74572 | file | 2007-07-11 14:03:08 -0300 (Wed, 11 Jul 2007) | 2 lines Instead of figuring out kernel versions that have compiler.h and not... let's just use autoconf to check for it's presence. (issue #10174 reported by francesco_r) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74575 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 91feea175d..4a4629009c 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -45,6 +45,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include +#ifdef HAVE_LINUX_COMPILER_H +#include +#endif #include /* Still use some IXJ specific stuff */ #include diff --git a/configure b/configure index db1db0e0ed..33c91a509d 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 74212 . +# From configure.ac Revision: 74375 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -12127,13 +12127,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12173,13 +12171,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -39783,6 +39779,141 @@ fi +if test "${ac_cv_header_linux_compiler_h+set}" = set; then + { echo "$as_me:$LINENO: checking for linux/compiler.h" >&5 +echo $ECHO_N "checking for linux/compiler.h... $ECHO_C" >&6; } +if test "${ac_cv_header_linux_compiler_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_compiler_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_compiler_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking linux/compiler.h usability" >&5 +echo $ECHO_N "checking linux/compiler.h usability... $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. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking linux/compiler.h presence" >&5 +echo $ECHO_N "checking linux/compiler.h presence... $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 +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: linux/compiler.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: linux/compiler.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: linux/compiler.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: linux/compiler.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: linux/compiler.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: linux/compiler.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: linux/compiler.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/compiler.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: linux/compiler.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for linux/compiler.h" >&5 +echo $ECHO_N "checking for linux/compiler.h... $ECHO_C" >&6; } +if test "${ac_cv_header_linux_compiler_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_linux_compiler_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_compiler_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_compiler_h" >&6; } + +fi +if test $ac_cv_header_linux_compiler_h = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LINUX_COMPILER_H 1 +_ACEOF + +fi + + + { echo "$as_me:$LINENO: checking for linux/ixjuser.h" >&5 echo $ECHO_N "checking for linux/ixjuser.h... $ECHO_C" >&6; } if test "${ac_cv_header_linux_ixjuser_h+set}" = set; then @@ -39796,7 +39927,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + #ifdef HAVE_LINUX_COMPILER_H #include #endif diff --git a/configure.ac b/configure.ac index 081a5e35aa..5b6f7c68c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1028,9 +1028,12 @@ AC_SUBST(EDITLINE_LIB) AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0]) AC_SUBST(PBX_H323) +AC_CHECK_HEADER([linux/compiler.h], + [AC_DEFINE_UNQUOTED([HAVE_LINUX_COMPILER_H], 1, [Define to 1 if your system has linux/compiler.h.])]) + AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [ #include - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + #ifdef HAVE_LINUX_COMPILER_H #include #endif ]) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index f4052cc81a..085cd9e555 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -244,6 +244,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H +/* Define to 1 if your system has linux/compiler.h. */ +#undef HAVE_LINUX_COMPILER_H + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H