[Opalvoip-svn] SF.net SVN: opalvoip:[20713] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: <ms3...@us...> - 2008-08-21 17:48:02
|
Revision: 20713 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20713&view=rev Author: ms30002000 Date: 2008-08-21 17:48:11 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Move architecture dependent checks swab and upad128 to where they belong Modified Paths: -------------- ptlib/trunk/configure ptlib/trunk/configure.ac Modified: ptlib/trunk/configure =================================================================== --- ptlib/trunk/configure 2008-08-21 03:20:32 UTC (rev 20712) +++ ptlib/trunk/configure 2008-08-21 17:48:11 UTC (rev 20713) @@ -3314,6 +3314,8 @@ + + PTLIBDIR=`pwd` @@ -3516,6 +3518,96 @@ #define P_PTHREADS 1 _ACEOF + +{ echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; freebsd* ) OSTYPE=FreeBSD ; @@ -3529,6 +3621,95 @@ #define P_PTHREADS 1 _ACEOF + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; openbsd* ) OSTYPE=OpenBSD ; @@ -3541,6 +3722,95 @@ #define P_PTHREADS 1 _ACEOF + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; netbsd* ) OSTYPE=NetBSD ; @@ -3553,6 +3823,95 @@ #define P_PTHREADS 1 _ACEOF + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; solaris* | sunos* ) OSTYPE=solaris ; @@ -3564,6 +3923,63 @@ #define P_PTHREADS 1 _ACEOF + + ptlib_upad128=no + + { echo "$as_me:$LINENO: checking for upad128_t" >&5 +echo $ECHO_N "checking for upad128_t... $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 <sys/types.h> +int +main () +{ +upad128_t upad; upad._q = 0.0; + ; + return 0; +} +_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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ptlib_upad128=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { echo "$as_me:$LINENO: result: ${ptlib_upad128}" >&5 +echo "${ECHO_T}${ptlib_upad128}" >&6; } + + if test $ptlib_upad128 = yes; then + cat >>confdefs.h <<\_ACEOF +#define P_HAS_UPAD128_T 1 +_ACEOF + +fi + + ;; darwin* ) OSTYPE=Darwin ; @@ -3581,17 +3997,284 @@ #define P_PTHREADS 1 _ACEOF + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; beos*) OSTYPE=beos ; OS_TAG="P_BEOS" ; OSRELEASE=`uname -r` ; STDCCFLAGS="$STDCCFLAGS -D__BEOS__" + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; cygwin*) OSTYPE=cygwin ; OS_TAG="P_CYGWIN" ; OSRELEASE="`uname -r`"; + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; mingw*) OSTYPE=mingw ; @@ -3602,11 +4285,189 @@ STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ; ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32 -liphlpapi -lole32" ; NEEDS_PTHREADS=no ; + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + ;; * ) OSTYPE="$target_os" ; OS_TAG="P_UNKNOWN_OS" ; OSRELEASE="\"${OSTYPE}_`uname -r`\"" ; + { echo "$as_me:$LINENO: checking for swab" >&5 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; } +if test "${ac_cv_func_swab+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define swab to an innocuous variant, in case <limits.h> declares swab. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define swab innocuous_swab + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char swab (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef swab + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char swab (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_swab || defined __stub___swab +choke me +#endif + +int +main () +{ +return swab (); + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_swab=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_swab=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 +echo "${ECHO_T}$ac_cv_func_swab" >&6; } +if test $ac_cv_func_swab = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SYSTEM_SWAB +_ACEOF + +fi + { echo "$as_me:$LINENO: WARNING: \"OS $target_os not recognized - proceed with caution!\"" >&5 echo "$as_me: WARNING: \"OS $target_os not recognized - proceed with caution!\"" >&2;} ; ;; @@ -3787,8 +4648,7 @@ if test ${OSTYPE} != "Darwin" ; then - -ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4800,8 +5660,10 @@ if test 0 = 1 ; then + { { echo "$as_me:$LINENO: error: error" >&5 +echo "$as_me: error: error" >&2;} + { (exit 1); exit 1; }; } - { echo "$as_me:$LINENO: checking if compiler accepts -ffunction-sections" >&5 echo $ECHO_N "checking if compiler accepts -ffunction-sections... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -6263,65 +7125,8 @@ -if test "${OSTYPE:-unknown}" = "solaris"; then - { echo "$as_me:$LINENO: checking for upad128_t" >&5 -echo $ECHO_N "checking for upad128_t... $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 <sys/types.h> -int -main () -{ -upad128_t upad; upad._q = 0.0; - ; - return 0; -} -_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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - has_upad128_t=y -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test ${has_upad128_t} == "y"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define P_HAS_UPAD128_T 1 -_ACEOF - - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi -fi - - - if test ${OSTYPE} != Darwin ; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6523,10 +7328,6 @@ HAS_PTHREADS=yes ENDLDLIBS="$ENDLDLIBS -pthread" STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" - elif test ${OSTYPE} = FreeBSD ; then - HAS_PTHREADS=yes - ENDLDLIBS="$ENDLDLIBS -pthread" - STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" fi fi @@ -13559,104 +14360,7 @@ -if test "$OSTYPE" = "solaris" ; then - USE_SYSTEM_SWAB= -else - { echo "$as_me:$LINENO: checking for swab" >&5 -echo $ECHO_N "checking for swab... $ECHO_C" >&6; } -if test "${ac_cv_func_swab+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define swab to an innocuous variant, in case <limits.h> declares swab. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define swab innocuous_swab -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char swab (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef swab - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char swab (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_swab || defined __stub___swab -choke me -#endif - -int -main () -{ -return swab (); - ; - 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_swab=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_swab=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5 -echo "${ECHO_T}$ac_cv_func_swab" >&6; } -if test $ac_cv_func_swab = yes; then - USE_SYSTEM_SWAB=1 -fi - -fi -if test "x$ac_cv_func_swab" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define USE_SYSTEM_SWAB -_ACEOF - -fi - - # Check whether --enable-memcheck was given. if test "${enable_memcheck+set}" = set; then enableval=$enable_memcheck; memcheck=$enableval Modified: ptlib/trunk/configure.ac =================================================================== --- ptlib/trunk/configure.ac 2008-08-21 03:20:32 UTC (rev 20712) +++ ptlib/trunk/configure.ac 2008-08-21 17:48:11 UTC (rev 20713) @@ -219,6 +219,24 @@ AS_IF([test AS_VAR_GET([ptlib_openssl_const]) = yes], [$1], [$2])[] ]) +dnl PTLIB_CHECK_UPAD128 +dnl Check for upad128_t (solaris only) +dnl Arguments: +dnl Return: $1 action if-found +dnl $2 action if-not-found +AC_DEFUN([PTLIB_CHECK_UPAD128], + [ + ptlib_upad128=no + + AC_MSG_CHECKING(for upad128_t) + AC_TRY_COMPILE([#include <sys/types.h>], + [upad128_t upad; upad._q = 0.0;], + [ptlib_upad128=yes]) + AC_MSG_RESULT(${ptlib_upad128}) + + AS_IF([test AS_VAR_GET([ptlib_upad128]) = yes], [$1], [$2])[] + ]) + dnl PTLIB_OPENSSL_AES dnl Check for directX dnl Arguments: @@ -352,6 +370,7 @@ OS_TAG="P_LINUX" ; need_pragma=yes ; AC_DEFINE(P_PTHREADS, 1, "PThreads found") + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; freebsd* ) OSTYPE=FreeBSD ; @@ -361,6 +380,7 @@ fi need_pragma=yes ; AC_DEFINE(P_PTHREADS, 1, "PThreads found") + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; openbsd* ) OSTYPE=OpenBSD ; @@ -369,6 +389,7 @@ ENDLDLIBS="-lossaudio" ; need_pragma=yes ; AC_DEFINE(P_PTHREADS, 1, "PThreads found") + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; netbsd* ) OSTYPE=NetBSD ; @@ -377,6 +398,7 @@ ENDLDLIBS="-lossaudio" ; need_pragma=yes ; AC_DEFINE(P_PTHREADS, 1, "PThreads found") + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; solaris* | sunos* ) OSTYPE=solaris ; @@ -384,6 +406,9 @@ OSRELEASE=`uname -r | sed "s/5\.//g"` ; need_pragma=yes ; AC_DEFINE(P_PTHREADS, 1, "PThreads found") + dnl According to Andre Schulze <as...@rn...> + dnl Solaris swab should not be used + PTLIB_CHECK_UPAD128( [AC_DEFINE(P_HAS_UPAD128_T)] ) ;; darwin* ) OSTYPE=Darwin ; @@ -397,17 +422,20 @@ EXPATDIR=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6 fi AC_DEFINE(P_PTHREADS, 1, "PThreads found") + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; beos*) OSTYPE=beos ; OS_TAG="P_BEOS" ; OSRELEASE=`uname -r` ; STDCCFLAGS="$STDCCFLAGS -D__BEOS__" + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; cygwin*) OSTYPE=cygwin ; OS_TAG="P_CYGWIN" ; OSRELEASE="`uname -r`"; + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; mingw*) OSTYPE=mingw ; @@ -418,11 +446,13 @@ STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ; ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32 -liphlpapi -lole32" ; NEEDS_PTHREADS=no ; + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) ;; * ) OSTYPE="$target_os" ; OS_TAG="P_UNKNOWN_OS" ; OSRELEASE="\"${OSTYPE}_`uname -r`\"" ; + AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) AC_MSG_WARN("OS $target_os not recognized - proceed with caution!") ; ;; esac @@ -670,67 +700,6 @@ STDCXXFLAGS="$STDCCFLAGS -frtti" fi -GCSECTIONS=0 - -dnl Remove --gc-sections as the linker crashes when linking -dnl static executables with this option -dnl AC_MSG_CHECKING(if linker accepts --gc-sections) -dnl C_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]]) -dnl CXX $CFLAGS -Wl,--gc-sections conftest.cc > /dev/null 2>&1 -dnl if test $? = 0 ; then - -if test 0 = 1 ; then - - dnl AC_MSG_RESULT(yes) - - AC_MSG_CHECKING(if compiler accepts -ffunction-sections) - AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]]) - $CXX $CFLAGS -ffunction-sections -c conftest.$ac_ext > /dev/null 2>&1 - if test $? = 0 ; then - AC_MSG_RESULT(yes) - STDCCFLAGS="$STDCCFLAGS -ffunction-sections" - GCSECTIONS=1 - else - AC_MSG_RESULT(no) - fi - - dnl remove data-sections as not only does is case the linker to - dnl crash on some platforms, but seems to be broken w.r.t - dnl closure of templates with static member functions - dnl see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=8249 - dnl - dnl AC_MSG_CHECKING(if compiler accepts -fdata-sections) - dnl AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]]) - dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1 - dnl if test $? = 0 ; then - dnl AC_MSG_RESULT(yes) - dnl STDCCFLAGS="$STDCCFLAGS -fdata-sections" - dnl GCSECTIONS=1 - dnl else - dnl AC_MSG_RESULT(no) - dnl fi - - dnl as much as this flag would help, there is no known linker - dnl that can handle PTLib when it has been compiled with it - dnl AC_MSG_CHECKING(if compiler accepts -fvtable-gc) - dnl AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]]) - dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1 - dnl if test $? = 0 ; then - dnl AC_MSG_RESULT(yes) - dnl STDCCFLAGS="$STDCCFLAGS -fvtable-gc" - dnl GCSECTIONS=1 - dnl else - dnl AC_MSG_RESULT(no) - dnl fi - - if test $GCSECTIONS = 1; then - if test "${OSTYPE}" != "Darwin" ; then - P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -Wl,--gc-sections" - fi - fi -fi - - AC_LANG_POP(C++) dnl ######################################################################## @@ -1055,22 +1024,8 @@ fi -dnl ######################################################################## -dnl check if upad128_t is defined (Solaris) -if test "${OSTYPE:-unknown}" = "solaris"; then - AC_MSG_CHECKING(for upad128_t) - AC_TRY_COMPILE([#include <sys/types.h>], - [upad128_t upad; upad._q = 0.0;], has_upad128_t=y) - if test ${has_upad128_t} == "y"; then - AC_MSG_RESULT(yes) - AC_DEFINE(P_HAS_UPAD128_T) - else - AC_MSG_RESULT(no) - fi -fi - dnl ######################################################################## dnl check for Unix semaphores @@ -1123,10 +1078,6 @@ HAS_PTHREADS=yes ENDLDLIBS="$ENDLDLIBS -pthread" STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" - elif test ${OSTYPE} = FreeBSD ; then - HAS_PTHREADS=yes - ENDLDLIBS="$ENDLDLIBS -pthread" - STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" fi fi @@ -2042,19 +1993,6 @@ dnl ######################################################################## -dnl check for various functions -dnl According to Andre Schulze <as...@rn...> -dnl Solaris swab should not be used -if test "$OSTYPE" = "solaris" ; then - USE_SYSTEM_SWAB= -else - AC_CHECK_FUNC(swab,USE_SYSTEM_SWAB=1) -fi -if test "x$ac_cv_func_swab" = "xyes" ; then - AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()]) -fi - -dnl ######################################################################## dnl look for MEMORY_CHECK enabled. AC_ARG_ENABLE(memcheck, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |