solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Replace obsolete AC_TRY_XXX macros with AC_XXX_IFELSE

Browse source 
No real changes, just avoid warnings from autoconf 2.71 when
regenerating configure.

Note that double brackets must be used around any code using brackets to
preserve them during the expansion.
This commit is contained in:
Vadim Zeitlin 2023-07-23 23:14:12 +02:00
parent 04f7e0664b
commit 00960b40b9
10 changed files with 199 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

28
acinclude.m4
View file

@ -258,18 +258,18 @@ AC_DEFUN([WX_C_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian, [AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian,
[ac_cv_c_bigendian=unknown [ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro. # See if sys/param.h defines the BYTE_ORDER macro.
AC_TRY_COMPILE([#include <sys/types.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
#include <sys/param.h>], [ #include <sys/param.h>], [
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros bogus endian macros
#endif], [# It does; now see whether it defined to BIG_ENDIAN or not. #endif])], [# It does; now see whether it defined to BIG_ENDIAN or not.
AC_TRY_COMPILE([#include <sys/types.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
#include <sys/param.h>], [ #include <sys/param.h>], [
#if BYTE_ORDER != BIG_ENDIAN #if BYTE_ORDER != BIG_ENDIAN
not big endian not big endian
#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)]) #endif])], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
if test $ac_cv_c_bigendian = unknown; then if test $ac_cv_c_bigendian = unknown; then
AC_TRY_RUN([main () { AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
/* Are we little or big endian? From Harbison&Steele. */ /* Are we little or big endian? From Harbison&Steele. */
union union
{ {
@ -278,7 +278,7 @@ AC_TRY_RUN([main () {
} u; } u;
u.l = 1; u.l = 1;
exit (u.c[sizeof (long) - 1] == 1); exit (u.c[sizeof (long) - 1] == 1);
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown]) }]])], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
fi]) fi])
if test $ac_cv_c_bigendian = unknown; then if test $ac_cv_c_bigendian = unknown; then
AC_MSG_WARN([Assuming little-endian target machine - this may be overridden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file]) AC_MSG_WARN([Assuming little-endian target machine - this may be overridden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
@ -567,20 +567,20 @@ AC_DEFUN([AM_ICONV],
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h> AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
#include <iconv.h>], #include <iconv.h>],
[iconv_t cd = iconv_open("",""); [iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL); iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);], iconv_close(cd);])],
am_cv_func_iconv=yes) am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS" am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv" LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h> AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
#include <iconv.h>], #include <iconv.h>],
[iconv_t cd = iconv_open("",""); [iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL); iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);], iconv_close(cd);])],
am_cv_lib_iconv=yes am_cv_lib_iconv=yes
am_cv_func_iconv=yes) am_cv_func_iconv=yes)
LIBS="$am_save_LIBS" LIBS="$am_save_LIBS"
@ -589,7 +589,7 @@ AC_DEFUN([AM_ICONV],
if test "$am_cv_func_iconv" = yes; then if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const, AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const,
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <stdlib.h> #include <stdlib.h>
#include <iconv.h> #include <iconv.h>
extern extern
@ -602,7 +602,7 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
size_t iconv(); size_t iconv();
#endif #endif
], ],
[], [])],
wx_cv_func_iconv_const="no", wx_cv_func_iconv_const="no",
wx_cv_func_iconv_const="yes" wx_cv_func_iconv_const="yes"
) )
@ -645,9 +645,9 @@ define(WX_SYS_LARGEFILE_MACRO_VALUE,
[ [
AC_CACHE_CHECK([for $1 value needed for large files], [$3], AC_CACHE_CHECK([for $1 value needed for large files], [$3],
[ [
AC_TRY_COMPILE([#define $1 $2 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define $1 $2
#include <sys/types.h>], #include <sys/types.h>],
WX_SYS_LARGEFILE_TEST, WX_SYS_LARGEFILE_TEST)],
[$3=$2], [$3=$2],
[$3=no]) [$3=no])
] ]

12
build/aclocal/ac_raf_func_which_getservbyname_r.m4
View file

@ -26,7 +26,7 @@ AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
dnl we need to use C++ to detect missing prototypes dnl we need to use C++ to detect missing prototypes
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <netdb.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>], [
[ [
char *name; char *name;
char *proto; char *proto;
@ -34,10 +34,10 @@ AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
char buffer[2048]; char buffer[2048];
int buflen = 2048; int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen, &res) (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
], ]])],
ac_cv_func_which_getservbyname_r=six, ac_cv_func_which_getservbyname_r=six,
[ [
AC_TRY_COMPILE([#include <netdb.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>], [
[ [
char *name; char *name;
char *proto; char *proto;
@ -45,17 +45,17 @@ AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
char buffer[2048]; char buffer[2048];
int buflen = 2048; int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen) (void) getservbyname_r(name, proto, se, buffer, buflen)
], ]])],
ac_cv_func_which_getservbyname_r=five, ac_cv_func_which_getservbyname_r=five,
[ [
AC_TRY_COMPILE([#include <netdb.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
[ [
char *name; char *name;
char *proto; char *proto;
struct servent *se; struct servent *se;
struct servent_data data; struct servent_data data;
(void) getservbyname_r(name, proto, se, &data); (void) getservbyname_r(name, proto, se, &data);
], ])],
ac_cv_func_which_getservbyname_r=four, ac_cv_func_which_getservbyname_r=four,
ac_cv_func_which_getservbyname_r=no ac_cv_func_which_getservbyname_r=no
) )

4
build/aclocal/atomic_builtins.m4
View file

@ -8,13 +8,13 @@ AC_DEFUN([WX_ATOMIC_BUILTINS],
if test -n "$GCC"; then if test -n "$GCC"; then
AC_MSG_CHECKING([for __sync_xxx_and_fetch builtins]) AC_MSG_CHECKING([for __sync_xxx_and_fetch builtins])
AC_CACHE_VAL(wx_cv_cc_gcc_atomic_builtins, [ AC_CACHE_VAL(wx_cv_cc_gcc_atomic_builtins, [
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM(
[], [],
[ [
unsigned int value=0; unsigned int value=0;
volatile unsigned int r1 = __sync_add_and_fetch(&value, 2); volatile unsigned int r1 = __sync_add_and_fetch(&value, 2);
volatile unsigned int r2 = __sync_sub_and_fetch(&value, 1); volatile unsigned int r2 = __sync_sub_and_fetch(&value, 1);
], ])],
wx_cv_cc_gcc_atomic_builtins=yes, wx_cv_cc_gcc_atomic_builtins=yes,
wx_cv_cc_gcc_atomic_builtins=no) wx_cv_cc_gcc_atomic_builtins=no)
]) ])

28
build/aclocal/ax_cflags_gcc_option.m4
View file

@ -81,19 +81,18 @@ AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
VAR,[VAR="no, unknown" VAR,[VAR="no, unknown"
AC_LANG_SAVE AC_LANG_PUSH(C)
AC_LANG_C
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
"-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_POP()
]) ])
case ".$VAR" in case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
@ -117,19 +116,18 @@ AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
VAR,[VAR="no, unknown" VAR,[VAR="no, unknown"
AC_LANG_SAVE AC_LANG_PUSH(C++)
AC_LANG_CPLUSPLUS
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
"-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_POP()
]) ])
case ".$VAR" in case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
@ -152,19 +150,18 @@ AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
VAR,[VAR="no, unknown" VAR,[VAR="no, unknown"
AC_LANG_SAVE AC_LANG_PUSH(C)
AC_LANG_C
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
"-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_POP()
]) ])
case ".$VAR" in case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
@ -188,19 +185,18 @@ AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
VAR,[VAR="no, unknown" VAR,[VAR="no, unknown"
AC_LANG_SAVE AC_LANG_PUSH(C++)
AC_LANG_CPLUSPLUS
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
"-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_POP()
]) ])
case ".$VAR" in case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;

8
build/aclocal/bakefile-lang.m4
View file

@ -37,13 +37,13 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
AC_CACHE_CHECK( AC_CACHE_CHECK(
[whether we are using the $1 $2 compiler], [whether we are using the $1 $2 compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
[AC_TRY_COMPILE( [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[], [],
[ [
#ifndef $3 #ifndef $3
choke me choke me
#endif #endif
], ])],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no] [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
) )
@ -67,13 +67,13 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
AC_CACHE_CHECK( AC_CACHE_CHECK(
[whether we are using $1 $2 compiler v$5 or later], [whether we are using $1 $2 compiler v$5 or later],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
[AC_TRY_COMPILE( [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[], [],
[ [
#ifndef $3 || $3 < $4 #ifndef $3 || $3 < $4
choke me choke me
#endif #endif
], ])],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no] [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
) )

4
build/aclocal/bakefile.m4
View file

@ -600,7 +600,7 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
dnl test if we have gcc-3.4: dnl test if we have gcc-3.4:
AC_MSG_CHECKING([if the compiler supports precompiled headers]) AC_MSG_CHECKING([if the compiler supports precompiled headers])
AC_TRY_COMPILE([], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
[ [
#if !defined(__GNUC__) || !defined(__GNUC_MINOR__) #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
There is no PCH support There is no PCH support
@ -614,7 +614,7 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
( defined(__INTEL_COMPILER) ) ( defined(__INTEL_COMPILER) )
There is no PCH support There is no PCH support
#endif #endif
], ])],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
GCC_PCH=1 GCC_PCH=1

8
build/aclocal/sdl.m4
View file

@ -63,7 +63,7 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent dnl checks the results of sdl-config to some extent
dnl dnl
rm -f conf.sdltest rm -f conf.sdltest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -120,7 +120,7 @@ int main (int argc, char *argv[])
} }
} }
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ]])],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
@ -144,7 +144,7 @@ int main (int argc, char *argv[])
CFLAGS="$CFLAGS $SDL_CFLAGS" CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS" LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM[[
#include <stdio.h> #include <stdio.h>
#include "SDL.h" #include "SDL.h"
@ -152,7 +152,7 @@ int main(int argc, char *argv[])
{ return 0; } { return 0; }
#undef main #undef main
#define main K_and_R_C_main #define main K_and_R_C_main
], [ return 0; ], ]], [ return 0; ])],
[ echo "*** The test program compiled, but did not run. This usually means" [ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your" echo "*** version of SDL. If it is not finding SDL, you'll need to set your"

12
build/aclocal/visibility.m4
View file

@ -36,7 +36,7 @@ AC_DEFUN([WX_VISIBILITY],
wx_save_CXXFLAGS="$CXXFLAGS" wx_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
/* we need gcc >= 4.0, older versions with visibility support /* we need gcc >= 4.0, older versions with visibility support
didn't have class visibility: */ didn't have class visibility: */
@ -75,7 +75,7 @@ AC_DEFUN([WX_VISIBILITY],
Foo() {} Foo() {}
}; };
], ],
[], [])],
wx_cv_cc_visibility=yes, wx_cv_cc_visibility=yes,
wx_cv_cc_visibility=no) wx_cv_cc_visibility=no)
AC_LANG_POP() AC_LANG_POP()
@ -93,14 +93,14 @@ AC_DEFUN([WX_VISIBILITY],
CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
LDFLAGS="$LDFLAGS -shared -fPIC" LDFLAGS="$LDFLAGS -shared -fPIC"
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM(
[ [
#include <string> #include <string>
], ],
[ [
std::string s("hello"); std::string s("hello");
return s.length(); return s.length();
], ])],
wx_cv_cc_broken_libstdcxx_visibility=no, wx_cv_cc_broken_libstdcxx_visibility=no,
wx_cv_cc_broken_libstdcxx_visibility=yes) wx_cv_cc_broken_libstdcxx_visibility=yes)
AC_LANG_POP() AC_LANG_POP()
@ -112,7 +112,7 @@ AC_DEFUN([WX_VISIBILITY],
AC_MSG_CHECKING([whether we can work around it]) AC_MSG_CHECKING([whether we can work around it])
AC_CACHE_VAL(wx_cv_cc_visibility_workaround, [ AC_CACHE_VAL(wx_cv_cc_visibility_workaround, [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM(
[ [
#pragma GCC visibility push(default) #pragma GCC visibility push(default)
#include <string> #include <string>
@ -121,7 +121,7 @@ AC_DEFUN([WX_VISIBILITY],
[ [
std::string s("hello"); std::string s("hello");
return s.length(); return s.length();
], ])],
wx_cv_cc_visibility_workaround=no, wx_cv_cc_visibility_workaround=no,
wx_cv_cc_visibility_workaround=yes) wx_cv_cc_visibility_workaround=yes)
AC_LANG_POP() AC_LANG_POP()

41
configure vendored
View file

@ -23004,6 +23004,7 @@ else
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "$error_message as_fn_error $? "$error_message
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5; }
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -23103,7 +23104,6 @@ $as_echo_n "checking if CoreFoundation/CFBase.h is usable... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <CoreFoundation/CFBase.h> #include <CoreFoundation/CFBase.h>
int int
main () main ()
{ {
@ -32414,6 +32414,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
[
#include <stdio.h> #include <stdio.h>
int main (void) int main (void)
@ -32424,7 +32425,7 @@ else
exit (0); exit (0);
exit (1); exit (1);
} }
]
_ACEOF _ACEOF
if ac_fn_cxx_try_run "$LINENO"; then : if ac_fn_cxx_try_run "$LINENO"; then :
wx_cv_func_snprintf_pos_params=no wx_cv_func_snprintf_pos_params=no
@ -32850,6 +32851,7 @@ int
main () main ()
{ {
void *trace[1]; void *trace[1];
char **messages; char **messages;
backtrace(trace, 1); backtrace(trace, 1);
@ -35043,6 +35045,7 @@ int
main () main ()
{ {
char *name; char *name;
char *proto; char *proto;
struct servent *se, *res; struct servent *se, *res;
@ -35065,6 +35068,7 @@ int
main () main ()
{ {
char *name; char *name;
char *proto; char *proto;
struct servent *se; struct servent *se;
@ -36245,6 +36249,13 @@ $as_echo "no" >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
int
main ()
{
;
return 0;
}[
#include <stdio.h> #include <stdio.h>
#include "SDL.h" #include "SDL.h"
@ -36252,14 +36263,7 @@ int main(int argc, char *argv[])
{ return 0; } { return 0; }
#undef main #undef main
#define main K_and_R_C_main #define main K_and_R_C_main
], return 0; )
int
main ()
{
return 0;
;
return 0;
}
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
echo "*** The test program compiled, but did not run. This usually means" echo "*** The test program compiled, but did not run. This usually means"
@ -36509,6 +36513,13 @@ $as_echo "no" >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
int
main ()
{
;
return 0;
}[
#include <stdio.h> #include <stdio.h>
#include "SDL.h" #include "SDL.h"
@ -36516,14 +36527,7 @@ int main(int argc, char *argv[])
{ return 0; } { return 0; }
#undef main #undef main
#define main K_and_R_C_main #define main K_and_R_C_main
], return 0; )
int
main ()
{
return 0;
;
return 0;
}
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
echo "*** The test program compiled, but did not run. This usually means" echo "*** The test program compiled, but did not run. This usually means"
@ -40606,7 +40610,6 @@ if ${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown" ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown"
ac_ext=cpp ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

254
configure.in
View file

@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.58) AC_PREREQ(2.58)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@ -1325,12 +1324,13 @@ version or omitting it entirely."
AC_LANG_PUSH(C) AC_LANG_PUSH(C)
AC_MSG_CHECKING([if C compiler ($CC) works with SDK/version options]) AC_MSG_CHECKING([if C compiler ($CC) works with SDK/version options])
AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([$error_message])]) AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([$error_message])]
)
AC_LANG_POP() AC_LANG_POP()
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_MSG_CHECKING([if C++ compiler ($CXX) works with SDK/version options]) AC_MSG_CHECKING([if C++ compiler ($CXX) works with SDK/version options])
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM(
[ [
#include <Availability.h> #include <Availability.h>
], ],
@ -1345,7 +1345,7 @@ version or omitting it entirely."
#elif !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) #elif !defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
#error unrecognized platform #error unrecognized platform
#endif #endif
], ])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_FAILURE([$error_message])] [AC_MSG_FAILURE([$error_message])]
) )
@ -1411,14 +1411,14 @@ dnl This case is for OS X vs. everything else
case "${host}" in case "${host}" in
*-*-darwin* ) *-*-darwin* )
AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable]) AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h> AC_COMPILE_IFELSE(
],[], [AC_LANG_PROGRAM([#include <CoreFoundation/CFBase.h>],[])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_CHECKING([if __CF_USE_FRAMEWORK_INCLUDES__ is required]) AC_MSG_CHECKING([if __CF_USE_FRAMEWORK_INCLUDES__ is required])
AC_TRY_COMPILE([#define __CF_USE_FRAMEWORK_INCLUDES__ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define __CF_USE_FRAMEWORK_INCLUDES__
#include <CoreFoundation/CFBase.h> #include <CoreFoundation/CFBase.h>
],[], ],[])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
dnl We must use -D so source files that don't include wx/setup.h dnl We must use -D so source files that don't include wx/setup.h
dnl but do include CFBase will work. dnl but do include CFBase will work.
@ -1443,13 +1443,13 @@ case "${host}" in
dnl headers and libraries, so it's Windows-like in this case dnl headers and libraries, so it's Windows-like in this case
AC_CACHE_CHECK([if -mno-cygwin is in effect], wx_cv_nocygwin, AC_CACHE_CHECK([if -mno-cygwin is in effect], wx_cv_nocygwin,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[], [],
[ [
#ifdef __MINGW32__ #ifdef __MINGW32__
choke me choke me
#endif #endif
], ])],
wx_cv_nocygwin=no, wx_cv_nocygwin=no,
wx_cv_nocygwin=yes wx_cv_nocygwin=yes
) )
@ -1693,13 +1693,13 @@ if test -n "$LARGEFILE_CPPFLAGS"; then
wx_cv_STDC_EXT_required, wx_cv_STDC_EXT_required,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[], [],
[ [
#ifndef __STDC_EXT__ #ifndef __STDC_EXT__
choke me choke me
#endif #endif
], ])],
wx_cv_STDC_EXT_required=no, wx_cv_STDC_EXT_required=no,
wx_cv_STDC_EXT_required=yes wx_cv_STDC_EXT_required=yes
) )
@ -1758,12 +1758,12 @@ if test "x$SGICC" = "xyes"; then
AC_CACHE_CHECK([if cc version is 7.4.4 or greater], AC_CACHE_CHECK([if cc version is 7.4.4 or greater],
wx_cv_prog_sgicc744, wx_cv_prog_sgicc744,
[ [
AC_TRY_COMPILE([], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
[ [
#if _SGI_COMPILER_VERSION >= 744 #if _SGI_COMPILER_VERSION >= 744
chock me: mipsPro is 7.4.4 or later chock me: mipsPro is 7.4.4 or later
#endif #endif
], ])],
wx_cv_prog_sgicc744=no, wx_cv_prog_sgicc744=no,
wx_cv_prog_sgicc744=yes wx_cv_prog_sgicc744=yes
) )
@ -1779,12 +1779,12 @@ if test "x$SGICXX" = "xyes"; then
wx_cv_prog_sgicxx744, wx_cv_prog_sgicxx744,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE([], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
[ [
#if _SGI_COMPILER_VERSION >= 744 #if _SGI_COMPILER_VERSION >= 744
chock me: mipsPro is 7.4.4 or later chock me: mipsPro is 7.4.4 or later
#endif #endif
], ])],
wx_cv_prog_sgicxx744=no, wx_cv_prog_sgicxx744=no,
wx_cv_prog_sgicxx744=yes wx_cv_prog_sgicxx744=yes
) )
@ -2200,9 +2200,9 @@ if test "$wxUSE_ZLIB" != "no" ; then
dnl has anything more ancient (1.1.3 was released in July 1998) dnl has anything more ancient (1.1.3 was released in July 1998)
dnl anyhow dnl anyhow
AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h, AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
[AC_TRY_RUN( [AC_RUN_IFELSE(
dnl zlib.h defines ZLIB_VERSION="x.y.z" dnl zlib.h defines ZLIB_VERSION="x.y.z"
[ [AC_LANG_SOURCE([[
#include <zlib.h> #include <zlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -2218,7 +2218,7 @@ if test "$wxUSE_ZLIB" != "no" ; then
ZLIB_VERSION[4] >= '4')) ? "yes" : "no"); ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
return 0; return 0;
} }
], ]])],
ac_cv_header_zlib_h=`cat conftestval`, ac_cv_header_zlib_h=`cat conftestval`,
ac_cv_header_zlib_h=no, ac_cv_header_zlib_h=no,
dnl cross-compiling: don't have an answer, try later dnl cross-compiling: don't have an answer, try later
@ -2286,9 +2286,9 @@ if test "$wxUSE_LIBPNG" != "no" ; then
dnl libpng version 0.9 is known to not work, if an even newer dnl libpng version 0.9 is known to not work, if an even newer
dnl version is required, just bump it up in the test below dnl version is required, just bump it up in the test below
AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h, AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
[AC_TRY_RUN( [AC_RUN_IFELSE(
dnl png.h defines PNG_LIBPNG_VER=number dnl png.h defines PNG_LIBPNG_VER=number
[ [AC_LANG_SOURCE([[
#include <png.h> #include <png.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -2301,7 +2301,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
PNG_LIBPNG_VER > 90 ? "yes" : "no"); PNG_LIBPNG_VER > 90 ? "yes" : "no");
return 0; return 0;
} }
], ]])],
ac_cv_header_png_h=`cat conftestval`, ac_cv_header_png_h=`cat conftestval`,
ac_cv_header_png_h=no, ac_cv_header_png_h=no,
dnl cross-compiling: test (later) if we have any png.h dnl cross-compiling: test (later) if we have any png.h
@ -2364,14 +2364,14 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
dnl a compiler warning which configure considers as an error... dnl a compiler warning which configure considers as an error...
AC_MSG_CHECKING(for jpeglib.h) AC_MSG_CHECKING(for jpeglib.h)
AC_CACHE_VAL(ac_cv_header_jpeglib_h, AC_CACHE_VAL(ac_cv_header_jpeglib_h,
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
#include <stdio.h> #include <stdio.h>
#include <jpeglib.h> #include <jpeglib.h>
], ],
[ [
], ])],
ac_cv_header_jpeglib_h=yes, ac_cv_header_jpeglib_h=yes,
ac_cv_header_jpeglib_h=no ac_cv_header_jpeglib_h=no
) )
@ -2590,7 +2590,7 @@ if test "$wxUSE_EXPAT" != "no"; then
wx_cv_expat_is_not_broken, wx_cv_expat_is_not_broken,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <expat.h>],[], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <expat.h>],[])],
wx_cv_expat_is_not_broken=yes, wx_cv_expat_is_not_broken=yes,
wx_cv_expat_is_not_broken=no wx_cv_expat_is_not_broken=no
) )
@ -2872,14 +2872,14 @@ installed, where VER is 2, 3 or 4.
dnl gtk/gtk.h from them. dnl gtk/gtk.h from them.
AC_CACHE_CHECK([if GTK+ is version >= 2.20], wx_cv_gtk220, [ AC_CACHE_CHECK([if GTK+ is version >= 2.20], wx_cv_gtk220, [
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <gtk/gtk.h> #include <gtk/gtk.h>
], ],
[ [
#if !GTK_CHECK_VERSION(2,20,0) #if !GTK_CHECK_VERSION(2,20,0)
Not GTK+ 2.20 Not GTK+ 2.20
#endif #endif
], ])],
wx_cv_gtk220=yes, wx_cv_gtk220=yes,
wx_cv_gtk220=no wx_cv_gtk220=no
) )
@ -2890,14 +2890,14 @@ installed, where VER is 2, 3 or 4.
wx_cv_gtk218=yes wx_cv_gtk218=yes
else else
AC_CACHE_CHECK([if GTK+ is version >= 2.18], wx_cv_gtk218, [ AC_CACHE_CHECK([if GTK+ is version >= 2.18], wx_cv_gtk218, [
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <gtk/gtk.h> #include <gtk/gtk.h>
], ],
[ [
#if !GTK_CHECK_VERSION(2,18,0) #if !GTK_CHECK_VERSION(2,18,0)
Not GTK+ 2.18 Not GTK+ 2.18
#endif #endif
], ])],
wx_cv_gtk218=yes, wx_cv_gtk218=yes,
wx_cv_gtk218=no wx_cv_gtk218=no
) )
@ -2909,14 +2909,14 @@ installed, where VER is 2, 3 or 4.
wx_cv_gtk210=yes wx_cv_gtk210=yes
else else
AC_CACHE_CHECK([if GTK+ is version >= 2.10], wx_cv_gtk210, [ AC_CACHE_CHECK([if GTK+ is version >= 2.10], wx_cv_gtk210, [
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <gtk/gtk.h> #include <gtk/gtk.h>
], ],
[ [
#if !GTK_CHECK_VERSION(2,10,0) #if !GTK_CHECK_VERSION(2,10,0)
Not GTK+ 2.10 Not GTK+ 2.10
#endif #endif
], ])],
wx_cv_gtk210=yes, wx_cv_gtk210=yes,
wx_cv_gtk210=no wx_cv_gtk210=no
) )
@ -2939,14 +2939,14 @@ installed, where VER is 2, 3 or 4.
AC_CACHE_CHECK([for GDK Wayland backend], wx_cv_gdk_wayland, [ AC_CACHE_CHECK([for GDK Wayland backend], wx_cv_gdk_wayland, [
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <gdk/gdk.h> #include <gdk/gdk.h>
], ],
[ [
#ifndef GDK_WINDOWING_WAYLAND #ifndef GDK_WINDOWING_WAYLAND
Not GDK Windowing Wayland Not GDK Windowing Wayland
#endif #endif
], ])],
wx_cv_gdk_wayland=yes, wx_cv_gdk_wayland=yes,
wx_cv_gdk_wayland=no wx_cv_gdk_wayland=no
) )
@ -3051,14 +3051,14 @@ installed, where VER is 2, 3 or 4.
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <X11/xpm.h> #include <X11/xpm.h>
], ],
[ [
int version; int version;
version = XpmLibraryVersion(); version = XpmLibraryVersion();
], ])],
wx_cv_x11_xpm_h=yes, wx_cv_x11_xpm_h=yes,
wx_cv_x11_xpm_h=no wx_cv_x11_xpm_h=no
) )
@ -3090,7 +3090,7 @@ installed, where VER is 2, 3 or 4.
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_MSG_CHECKING([for X11/extensions/shape.h]) AC_MSG_CHECKING([for X11/extensions/shape.h])
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
], ],
@ -3098,7 +3098,7 @@ installed, where VER is 2, 3 or 4.
int dummy1, dummy2; int dummy1, dummy2;
XShapeQueryExtension((Display*)NULL, XShapeQueryExtension((Display*)NULL,
(int*)NULL, (int*)NULL); (int*)NULL, (int*)NULL);
], ])],
[ [
AC_DEFINE(HAVE_XSHAPE) AC_DEFINE(HAVE_XSHAPE)
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
@ -3449,8 +3449,8 @@ if test "$wxUSE_SHARED" = "yes"; then
saveLdflags="$LDFLAGS" saveLdflags="$LDFLAGS"
LDFLAGS="$saveLdflags -Wl,-rpath,/" LDFLAGS="$saveLdflags -Wl,-rpath,/"
AC_MSG_CHECKING([if the linker accepts -rpath]) AC_MSG_CHECKING([if the linker accepts -rpath])
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM(
[],[], [],[])],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
@ -3459,8 +3459,8 @@ if test "$wxUSE_SHARED" = "yes"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_CHECKING([if the linker accepts -R]) AC_MSG_CHECKING([if the linker accepts -R])
LDFLAGS="$saveLdflags -Wl,-R,/" LDFLAGS="$saveLdflags -Wl,-R,/"
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM(
[],[], [],[])],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
@ -3569,20 +3569,20 @@ AC_LANG_PUSH(C++) dnl tests below use overloaded functions and so need C++
AC_CACHE_CHECK([if size_t is unsigned int], AC_CACHE_CHECK([if size_t is unsigned int],
wx_cv_size_t_is_uint, wx_cv_size_t_is_uint,
[ [
dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work dnl an obvious check like AC_COMPILE_IFELSE[struct Foo { ... };] doesn't work
dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
dnl methods in a local class (i.e. class inside a function) declaration dnl methods in a local class (i.e. class inside a function) declaration
dnl without any objections!! dnl without any objections!!
dnl dnl
dnl hence the hack below: we must have Foo at global scope! dnl hence the hack below: we must have Foo at global scope!
AC_TRY_COMPILE([#include <stddef.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stddef.h>],
[ [
return 0; } return 0; }
struct Foo { void foo(size_t); void foo(unsigned int); }; struct Foo { void foo(size_t); void foo(unsigned int); };
int bar() { int bar() {
], ])],
wx_cv_size_t_is_uint=no, wx_cv_size_t_is_uint=no,
wx_cv_size_t_is_uint=yes wx_cv_size_t_is_uint=yes
) )
@ -3594,14 +3594,14 @@ if test "$wx_cv_size_t_is_uint" = "yes"; then
else else
AC_CACHE_CHECK([if size_t is unsigned long], AC_CACHE_CHECK([if size_t is unsigned long],
wx_cv_size_t_is_ulong, wx_cv_size_t_is_ulong,
AC_TRY_COMPILE([#include <stddef.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stddef.h>],
[ [
return 0; } return 0; }
struct Foo { void foo(size_t); void foo(unsigned long); }; struct Foo { void foo(size_t); void foo(unsigned long); };
int bar() { int bar() {
], ])],
wx_cv_size_t_is_ulong=no, wx_cv_size_t_is_ulong=no,
wx_cv_size_t_is_ulong=yes wx_cv_size_t_is_ulong=yes
) )
@ -3614,7 +3614,7 @@ fi
AC_CACHE_CHECK([if wchar_t is separate type], AC_CACHE_CHECK([if wchar_t is separate type],
wx_cv_wchar_t_is_separate_type, wx_cv_wchar_t_is_separate_type,
AC_TRY_COMPILE([#include <wchar.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <wchar.h>],
[ [
return 0; } return 0; }
@ -3624,7 +3624,7 @@ AC_CACHE_CHECK([if wchar_t is separate type],
void foo(unsigned long); }; void foo(unsigned long); };
int bar() { int bar() {
], ])],
wx_cv_wchar_t_is_separate_type=yes, wx_cv_wchar_t_is_separate_type=yes,
wx_cv_wchar_t_is_separate_type=no wx_cv_wchar_t_is_separate_type=no
) )
@ -3645,12 +3645,12 @@ dnl ---------------------------------------------------------------------------
dnl does passwd struct has the pw_gecos field? dnl does passwd struct has the pw_gecos field?
AC_CACHE_CHECK([for pw_gecos in struct passwd], wx_cv_struct_pw_gecos, AC_CACHE_CHECK([for pw_gecos in struct passwd], wx_cv_struct_pw_gecos,
[ [
AC_TRY_COMPILE([#include <pwd.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pwd.h>],
[ [
char *p; char *p;
struct passwd *pw; struct passwd *pw;
p = pw->pw_gecos; p = pw->pw_gecos;
], ])],
[ [
wx_cv_struct_pw_gecos=yes wx_cv_struct_pw_gecos=yes
], ],
@ -3727,7 +3727,7 @@ if test "$wx_cv_func_vsnprintf" = "yes"; then
dnl may have one taking a "char *" format instead of "const char *" dnl may have one taking a "char *" format instead of "const char *"
AC_CACHE_CHECK([if vsnprintf declaration is broken], wx_cv_func_broken_vsnprintf_decl, AC_CACHE_CHECK([if vsnprintf declaration is broken], wx_cv_func_broken_vsnprintf_decl,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -3737,7 +3737,7 @@ if test "$wx_cv_func_vsnprintf" = "yes"; then
va_list ap; va_list ap;
const char *fmt = "%s"; const char *fmt = "%s";
vsnprintf(buf, 10u, fmt, ap); vsnprintf(buf, 10u, fmt, ap);
], ])],
wx_cv_func_broken_vsnprintf_decl=no, wx_cv_func_broken_vsnprintf_decl=no,
wx_cv_func_broken_vsnprintf_decl=yes wx_cv_func_broken_vsnprintf_decl=yes
) )
@ -3758,7 +3758,7 @@ if test "$wx_cv_func_snprintf" = "yes"; then
dnl family and they all fallback to the same implementation dnl family and they all fallback to the same implementation
AC_CACHE_CHECK([if snprintf supports positional arguments], wx_cv_func_snprintf_pos_params, AC_CACHE_CHECK([if snprintf supports positional arguments], wx_cv_func_snprintf_pos_params,
[ [
AC_TRY_RUN( AC_RUN_IFELSE([AC_LANG_SOURCE([[
[ [
#include <stdio.h> #include <stdio.h>
@ -3770,7 +3770,7 @@ if test "$wx_cv_func_snprintf" = "yes"; then
exit (0); exit (0);
exit (1); exit (1);
} }
], ]]])],
wx_cv_func_snprintf_pos_params=no, wx_cv_func_snprintf_pos_params=no,
wx_cv_func_snprintf_pos_params=yes, wx_cv_func_snprintf_pos_params=yes,
dnl be pessimistic when cross-compiling dnl be pessimistic when cross-compiling
@ -3795,7 +3795,7 @@ if test "$wx_cv_func_vsscanf" = "yes"; then
dnl happens at least under HP-UX 11.31, see #15638). dnl happens at least under HP-UX 11.31, see #15638).
AC_CACHE_CHECK([if vsscanf() declaration is broken], wx_cv_func_broken_vsscanf_decl, AC_CACHE_CHECK([if vsscanf() declaration is broken], wx_cv_func_broken_vsscanf_decl,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -3804,7 +3804,7 @@ if test "$wx_cv_func_vsscanf" = "yes"; then
const char *buf; const char *buf;
va_list args; va_list args;
vsscanf(buf, "%s", args); vsscanf(buf, "%s", args);
], ])],
wx_cv_func_broken_vsscanf_decl=no, wx_cv_func_broken_vsscanf_decl=no,
wx_cv_func_broken_vsscanf_decl=yes wx_cv_func_broken_vsscanf_decl=yes
) )
@ -3837,8 +3837,8 @@ dnl MinGW has a vswprintf with a different prototype, and
dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
dnl finds it even if it is not declared in some versions... dnl finds it even if it is not declared in some versions...
AC_MSG_CHECKING([for _vsnwprintf]) AC_MSG_CHECKING([for _vsnwprintf])
AC_TRY_COMPILE([#include <wchar.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <wchar.h>],
[&_vsnwprintf;], [&_vsnwprintf;])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_DEFINE(HAVE__VSNWPRINTF)], AC_DEFINE(HAVE__VSNWPRINTF)],
[AC_MSG_RESULT([no])]); [AC_MSG_RESULT([no])]);
@ -3873,13 +3873,13 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
AC_CACHE_CHECK([for backtrace()], wx_cv_func_backtrace, AC_CACHE_CHECK([for backtrace()], wx_cv_func_backtrace,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <execinfo.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <execinfo.h>], [
[ [
void *trace[1]; void *trace[1];
char **messages; char **messages;
backtrace(trace, 1); backtrace(trace, 1);
messages = backtrace_symbols(trace, 1); messages = backtrace_symbols(trace, 1);
], ]])],
wx_cv_func_backtrace=yes, wx_cv_func_backtrace=yes,
wx_cv_func_backtrace=no wx_cv_func_backtrace=no
) )
@ -3898,11 +3898,11 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle, AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_LINK([#include <cxxabi.h>], AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
[ [
int rc; int rc;
__cxxabiv1::__cxa_demangle("foo", 0, 0, &rc); __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
], ])],
wx_cv_func_cxa_demangle=yes, wx_cv_func_cxa_demangle=yes,
wx_cv_func_cxa_demangle=no wx_cv_func_cxa_demangle=no
) )
@ -3932,14 +3932,14 @@ dnl get the library function to use for wxGetDiskSpace(): prefer POSIX
dnl statvfs() if it exists, but fall back to Linux/BSD-specific statfs() if dnl statvfs() if it exists, but fall back to Linux/BSD-specific statfs() if
dnl necessary. dnl necessary.
AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs, AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs,
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <stddef.h> #include <stddef.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>
], ],
[ [
statvfs("/", NULL); statvfs("/", NULL);
], ])],
wx_cv_func_statvfs=yes, wx_cv_func_statvfs=yes,
wx_cv_func_statvfs=no wx_cv_func_statvfs=no
) )
@ -3955,7 +3955,7 @@ if test "$wx_cv_func_statvfs" = "yes"; then
dnl pointers is just a warning and not an error in C dnl pointers is just a warning and not an error in C
AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t, AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/statvfs.h> #include <sys/statvfs.h>
], ],
@ -3966,10 +3966,10 @@ if test "$wx_cv_func_statvfs" = "yes"; then
l = fs.f_bsize; l = fs.f_bsize;
l += fs.f_blocks; l += fs.f_blocks;
l += fs.f_bavail; l += fs.f_bavail;
], ])],
wx_cv_type_statvfs_t=statvfs_t, wx_cv_type_statvfs_t=statvfs_t,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/statvfs.h> #include <sys/statvfs.h>
], ],
@ -3980,7 +3980,7 @@ if test "$wx_cv_func_statvfs" = "yes"; then
l = fs.f_bsize; l = fs.f_bsize;
l += fs.f_blocks; l += fs.f_blocks;
l += fs.f_bavail; l += fs.f_bavail;
], ])],
wx_cv_type_statvfs_t="struct statvfs", wx_cv_type_statvfs_t="struct statvfs",
wx_cv_type_statvfs_t="unknown" wx_cv_type_statvfs_t="unknown"
) )
@ -3999,7 +3999,7 @@ fi
if test "$wx_cv_type_statvfs_t" = "unknown"; then if test "$wx_cv_type_statvfs_t" = "unknown"; then
AC_CACHE_CHECK(for statfs, wx_cv_func_statfs, AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#if defined(__BSD__) #if defined(__BSD__)
#include <sys/param.h> #include <sys/param.h>
@ -4015,7 +4015,7 @@ if test "$wx_cv_type_statvfs_t" = "unknown"; then
l = fs.f_bsize; l = fs.f_bsize;
l += fs.f_blocks; l += fs.f_blocks;
l += fs.f_bavail; l += fs.f_bavail;
], ])],
wx_cv_func_statfs=yes, wx_cv_func_statfs=yes,
wx_cv_func_statfs=no wx_cv_func_statfs=no
) )
@ -4025,7 +4025,7 @@ if test "$wx_cv_type_statvfs_t" = "unknown"; then
dnl check whether we have its dcelaration too: some systems (AIX 4) lack it dnl check whether we have its dcelaration too: some systems (AIX 4) lack it
AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl, AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#if defined(__BSD__) #if defined(__BSD__)
#include <sys/param.h> #include <sys/param.h>
@ -4037,7 +4037,7 @@ if test "$wx_cv_type_statvfs_t" = "unknown"; then
[ [
struct statfs fs; struct statfs fs;
statfs("", &fs); statfs("", &fs);
], ])],
wx_cv_func_statfs_decl=yes, wx_cv_func_statfs_decl=yes,
wx_cv_func_statfs_decl=no wx_cv_func_statfs_decl=no
) )
@ -4287,7 +4287,7 @@ if test "$TOOLKIT" != "MSW"; then
case "${host}" in case "${host}" in
*-*-qnx*) *-*-qnx*)
dnl -lpthread works, i.e. AC_TRY_LINK() would pass, but results dnl -lpthread works, i.e. AC_LINK_IFELSE() would pass, but results
dnl in warnings and is not needed under QNX so try without it dnl in warnings and is not needed under QNX so try without it
dnl first dnl first
THREAD_OPTS="none pthread" THREAD_OPTS="none pthread"
@ -4326,8 +4326,8 @@ if test "$TOOLKIT" != "MSW"; then
LIBS="$THREADS_LINK $LIBS" LIBS="$THREADS_LINK $LIBS"
CFLAGS="$THREADS_CFLAGS $CFLAGS" CFLAGS="$THREADS_CFLAGS $CFLAGS"
AC_TRY_LINK([#include <pthread.h>], AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
[pthread_create(0,0,0,0);], [pthread_create(0,0,0,0);])],
THREADS_OK=yes) THREADS_OK=yes)
LIBS="$save_LIBS" LIBS="$save_LIBS"
@ -4414,14 +4414,14 @@ if test "$TOOLKIT" != "MSW"; then
dnl function and not give a warning even if it's unavailable, so use dnl function and not give a warning even if it's unavailable, so use
dnl the C++ one for this test dnl the C++ one for this test
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <pthread.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
void ThreadCleanupFunc(void *p); void ThreadCleanupFunc(void *p);
], ],
[ [
void *p; void *p;
pthread_cleanup_push(ThreadCleanupFunc, p); pthread_cleanup_push(ThreadCleanupFunc, p);
pthread_cleanup_pop(0); pthread_cleanup_pop(0);
], [ ])], [
wx_cv_func_pthread_cleanup=yes wx_cv_func_pthread_cleanup=yes
], [ ], [
wx_cv_func_pthread_cleanup=no wx_cv_func_pthread_cleanup=no
@ -4496,11 +4496,11 @@ if test "$TOOLKIT" != "MSW"; then
AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t, AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
[ [
AC_TRY_COMPILE([#include <pthread.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
[ [
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
], ])],
wx_cv_type_pthread_mutexattr_t=yes, wx_cv_type_pthread_mutexattr_t=yes,
wx_cv_type_pthread_mutexattr_t=no wx_cv_type_pthread_mutexattr_t=no
) )
@ -4513,11 +4513,11 @@ if test "$TOOLKIT" != "MSW"; then
dnl present in some systems' headers dnl present in some systems' headers
AC_CACHE_CHECK([for pthread_mutexattr_settype declaration], AC_CACHE_CHECK([for pthread_mutexattr_settype declaration],
wx_cv_func_pthread_mutexattr_settype_decl, [ wx_cv_func_pthread_mutexattr_settype_decl, [
AC_TRY_COMPILE([#include <pthread.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
[ [
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
], ])],
wx_cv_func_pthread_mutexattr_settype_decl=yes, wx_cv_func_pthread_mutexattr_settype_decl=yes,
wx_cv_func_pthread_mutexattr_settype_decl=no wx_cv_func_pthread_mutexattr_settype_decl=no
) )
@ -4530,10 +4530,10 @@ if test "$TOOLKIT" != "MSW"; then
AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER], AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
wx_cv_type_pthread_rec_mutex_init, wx_cv_type_pthread_rec_mutex_init,
[ [
AC_TRY_COMPILE([#include <pthread.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
[ [
pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
], [ ])], [
wx_cv_type_pthread_rec_mutex_init=yes wx_cv_type_pthread_rec_mutex_init=yes
], [ ], [
wx_cv_type_pthread_rec_mutex_init=no wx_cv_type_pthread_rec_mutex_init=no
@ -4553,10 +4553,10 @@ if test "$TOOLKIT" != "MSW"; then
wx_cv_type_abi_forced_unwind, wx_cv_type_abi_forced_unwind,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <cxxabi.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
[ [
void foo(abi::__forced_unwind&); void foo(abi::__forced_unwind&);
], ])],
wx_cv_type_abi_forced_unwind=yes, wx_cv_type_abi_forced_unwind=yes,
wx_cv_type_abi_forced_unwind=no wx_cv_type_abi_forced_unwind=no
) )
@ -5068,24 +5068,24 @@ if test "$USE_UNIX" = 1 ; then
dnl redefines ioctl as oss_ioctrl inside it and so we also need to test dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
dnl whether we need -lossaudio at link-time dnl whether we need -lossaudio at link-time
AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [ AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
], ],
[ [
ioctl(0, SNDCTL_DSP_SPEED, 0); ioctl(0, SNDCTL_DSP_SPEED, 0);
], ])],
ac_cv_header_sys_soundcard=yes, ac_cv_header_sys_soundcard=yes,
[ [
saveLibs="$LIBS" saveLibs="$LIBS"
LIBS="$saveLibs -lossaudio" LIBS="$saveLibs -lossaudio"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
], ],
[ [
ioctl(0, SNDCTL_DSP_SPEED, 0); ioctl(0, SNDCTL_DSP_SPEED, 0);
], ])],
ac_cv_header_sys_soundcard=yes, ac_cv_header_sys_soundcard=yes,
[ [
LIBS="$saveLibs" LIBS="$saveLibs"
@ -5396,7 +5396,7 @@ if test "$wxUSE_XLOCALE" = "yes" ; then
AC_CACHE_CHECK([for locale_t], wx_cv_type_locale_t, AC_CACHE_CHECK([for locale_t], wx_cv_type_locale_t,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#ifdef HAVE_XLOCALE_H #ifdef HAVE_XLOCALE_H
#include <xlocale.h> #include <xlocale.h>
@ -5409,7 +5409,7 @@ if test "$wxUSE_XLOCALE" = "yes" ; then
strtod_l(NULL, NULL, t); strtod_l(NULL, NULL, t);
strtol_l(NULL, NULL, 0, t); strtol_l(NULL, NULL, 0, t);
strtoul_l(NULL, NULL, 0, t); strtoul_l(NULL, NULL, 0, t);
], ])],
wx_cv_type_locale_t=yes, wx_cv_type_locale_t=yes,
wx_cv_type_locale_t=no wx_cv_type_locale_t=no
) )
@ -5511,7 +5511,7 @@ if test "$ac_cv_func_gettimeofday" = "yes"; then
wx_cv_func_gettimeofday_has_2_args, wx_cv_func_gettimeofday_has_2_args,
[ [
dnl on some _really_ old systems it takes only 1 argument dnl on some _really_ old systems it takes only 1 argument
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
@ -5519,9 +5519,9 @@ if test "$ac_cv_func_gettimeofday" = "yes"; then
[ [
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
], ])],
wx_cv_func_gettimeofday_has_2_args=yes, wx_cv_func_gettimeofday_has_2_args=yes,
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
@ -5529,7 +5529,7 @@ if test "$ac_cv_func_gettimeofday" = "yes"; then
[ [
struct timeval tv; struct timeval tv;
gettimeofday(&tv); gettimeofday(&tv);
], ])],
wx_cv_func_gettimeofday_has_2_args=no, wx_cv_func_gettimeofday_has_2_args=no,
[ [
AC_MSG_WARN([failed to determine number of gettimeofday() arguments]) AC_MSG_WARN([failed to determine number of gettimeofday() arguments])
@ -5551,38 +5551,38 @@ if test "$wxUSE_DATETIME" = "yes"; then
wx_cv_var_timezone, wx_cv_var_timezone,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <time.h> #include <time.h>
], ],
[ [
int tz; int tz;
tz = timezone; tz = timezone;
], ])],
[ [
wx_cv_var_timezone=timezone wx_cv_var_timezone=timezone
], ],
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <time.h> #include <time.h>
], ],
[ [
int tz; int tz;
tz = _timezone; tz = _timezone;
], ])],
[ [
wx_cv_var_timezone=_timezone wx_cv_var_timezone=_timezone
], ],
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <time.h> #include <time.h>
], ],
[ [
int tz; int tz;
tz = __timezone; tz = __timezone;
], ])],
[ [
wx_cv_var_timezone=__timezone wx_cv_var_timezone=__timezone
], ],
@ -5612,14 +5612,14 @@ if test "$wxUSE_DATETIME" = "yes"; then
AC_CACHE_CHECK(for tm_gmtoff in struct tm, AC_CACHE_CHECK(for tm_gmtoff in struct tm,
wx_cv_struct_tm_has_gmtoff, wx_cv_struct_tm_has_gmtoff,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <time.h> #include <time.h>
], ],
[ [
struct tm tm; struct tm tm;
tm.tm_gmtoff++; tm.tm_gmtoff++;
], ])],
[ [
wx_cv_struct_tm_has_gmtoff=yes wx_cv_struct_tm_has_gmtoff=yes
], ],
@ -5635,14 +5635,14 @@ if test "$wxUSE_DATETIME" = "yes"; then
AC_CACHE_CHECK([for _NL_TIME_FIRST_WEEKDAY in langinfo.h], AC_CACHE_CHECK([for _NL_TIME_FIRST_WEEKDAY in langinfo.h],
wx_cv_have_nl_time_first_weekday, wx_cv_have_nl_time_first_weekday,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#define _GNU_SOURCE #define _GNU_SOURCE
#include <langinfo.h> #include <langinfo.h>
], ],
[ [
_NL_TIME_FIRST_WEEKDAY; _NL_TIME_FIRST_WEEKDAY;
], ])],
[ [
wx_cv_have_nl_time_first_weekday=yes wx_cv_have_nl_time_first_weekday=yes
], ],
@ -5706,7 +5706,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
wx_cv_type_getsockname3, wx_cv_type_getsockname3,
[ [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5714,7 +5714,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[ [
socklen_t len; socklen_t len;
getsockname(0, 0, &len); getsockname(0, 0, &len);
], ])],
wx_cv_type_getsockname3=socklen_t, wx_cv_type_getsockname3=socklen_t,
[ [
dnl the compiler will compile the version with size_t dnl the compiler will compile the version with size_t
@ -5728,7 +5728,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
CFLAGS="-Werror $CFLAGS" CFLAGS="-Werror $CFLAGS"
fi fi
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5736,9 +5736,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[ [
size_t len; size_t len;
getsockname(0, 0, &len); getsockname(0, 0, &len);
], ])],
wx_cv_type_getsockname3=size_t, wx_cv_type_getsockname3=size_t,
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5746,7 +5746,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[ [
int len; int len;
getsockname(0, 0, &len); getsockname(0, 0, &len);
], ])],
wx_cv_type_getsockname3=int, wx_cv_type_getsockname3=int,
wx_cv_type_getsockname3=unknown wx_cv_type_getsockname3=unknown
) )
@ -5774,7 +5774,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
dnl converting between incompatible pointer types in C. dnl converting between incompatible pointer types in C.
dnl So this test needs to be done in C++ mode. dnl So this test needs to be done in C++ mode.
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5782,10 +5782,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[ [
socklen_t len; socklen_t len;
getsockopt(0, 0, 0, 0, &len); getsockopt(0, 0, 0, 0, &len);
], ])],
wx_cv_type_getsockopt5=socklen_t, wx_cv_type_getsockopt5=socklen_t,
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5793,9 +5793,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[ [
size_t len; size_t len;
getsockopt(0, 0, 0, 0, &len); getsockopt(0, 0, 0, 0, &len);
], ])],
wx_cv_type_getsockopt5=size_t, wx_cv_type_getsockopt5=size_t,
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5803,7 +5803,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[ [
int len; int len;
getsockopt(0, 0, 0, 0, &len); getsockopt(0, 0, 0, 0, &len);
], ])],
wx_cv_type_getsockopt5=int, wx_cv_type_getsockopt5=int,
wx_cv_type_getsockopt5=unknown wx_cv_type_getsockopt5=unknown
) )
@ -5828,7 +5828,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
[whether we have sockaddr_in6], [whether we have sockaddr_in6],
[wx_cv_type_sockaddr_in6], [wx_cv_type_sockaddr_in6],
[ [
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -5836,7 +5836,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
], ],
[ [
struct sockaddr_in6 sa6; struct sockaddr_in6 sa6;
], ])],
wx_cv_type_sockaddr_in6=yes, wx_cv_type_sockaddr_in6=yes,
wx_cv_type_sockaddr_in6=no wx_cv_type_sockaddr_in6=no
) )
@ -7034,7 +7034,7 @@ if test "$USE_WIN32" = 1 ; then
dnl we need just the header, not the library, as we load the dnl we need just the header, not the library, as we load the
dnl DLL dynamically anyhow during run-time dnl DLL dynamically anyhow during run-time
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[#include <windows.h> [#include <windows.h>
#include <imagehlp.h>], #include <imagehlp.h>],
[ [
@ -7044,7 +7044,7 @@ if test "$USE_WIN32" = 1 ; then
#if API_VERSION_NUMBER < 9 #if API_VERSION_NUMBER < 9
#error API_VERSION_NUMBER at least 9 required. #error API_VERSION_NUMBER at least 9 required.
#endif #endif
], ])],
wx_cv_lib_debughlp=yes, wx_cv_lib_debughlp=yes,
wx_cv_lib_debughlp=no wx_cv_lib_debughlp=no
) )
@ -7116,12 +7116,12 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
dnl we need just the header, not the library, as we load the dnl we need just the header, not the library, as we load the
dnl GDI+ DLL dynamically anyhow during run-time dnl GDI+ DLL dynamically anyhow during run-time
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[#include <windows.h> [#include <windows.h>
#include <gdiplus.h>], #include <gdiplus.h>],
[ [
using namespace Gdiplus; using namespace Gdiplus;
], ])],
wx_cv_lib_gdiplus=yes, wx_cv_lib_gdiplus=yes,
wx_cv_lib_gdiplus=no wx_cv_lib_gdiplus=no
) )
@ -7136,14 +7136,14 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
[ [
dnl same as above, we need to test only for the headers dnl same as above, we need to test only for the headers
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[#include <windows.h> [#include <windows.h>
#include <d2d1.h> #include <d2d1.h>
#include <dwrite.h> #include <dwrite.h>
], ],
[ [
ID2D1Factory* factory = NULL; ID2D1Factory* factory = NULL;
], ])],
wx_cv_lib_direct2d=yes, wx_cv_lib_direct2d=yes,
wx_cv_lib_direct2d=no wx_cv_lib_direct2d=no
) )
@ -7244,7 +7244,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
old_CPPFLAGS="$CPPFLAGS" old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-x objective-c++ $CPPFLAGS" CPPFLAGS="-x objective-c++ $CPPFLAGS"
AC_MSG_CHECKING([if AVKit is available]) AC_MSG_CHECKING([if AVKit is available])
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[#include "AvailabilityMacros.h"], [#include "AvailabilityMacros.h"],
[ [
#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
@ -7252,7 +7252,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
#else #else
choke me choke me
#endif #endif
], ])],
[GST_LIBS="$GST_LIBS -weak_framework AVKit"; AC_MSG_RESULT(yes)], [GST_LIBS="$GST_LIBS -weak_framework AVKit"; AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) )