Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more AC_CHECK_HEADERS fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-07-20 18:27:35 +00:00
parent 332987ea38
commit ada47ad6fb
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_CHECK_HEADER(iostream,,, [ ]) AC_CHECK_HEADERS(iostream,,, [ ])
if test "$ac_cv_header_iostream" = "yes" ; then if test "$ac_cv_header_iostream" = "yes" ; then
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])

22
configure.in
View File

@@ -1841,7 +1841,7 @@ AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h,,, [AC_
dnl maybe wchar_t is in wcstr.h if we don't have wchar.h? dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
if test "$ac_cv_header_wchar_h" != "yes"; then if test "$ac_cv_header_wchar_h" != "yes"; then
AC_CHECK_HEADER(wcstr.h,,, [AC_INCLUDES_DEFAULT()]) AC_CHECK_HEADERS(wcstr.h,,, [AC_INCLUDES_DEFAULT()])
fi fi
case "${host}" in case "${host}" in
@@ -1859,7 +1859,7 @@ esac
dnl POSIX needs this for select(), but old systems don't have it dnl POSIX needs this for select(), but old systems don't have it
if test "$USE_UNIX" = 1 ; then if test "$USE_UNIX" = 1 ; then
AC_CHECK_HEADER([sys/select.h],,, [AC_INCLUDES_DEFAULT()]) AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
fi fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -3015,7 +3015,7 @@ WIDGET_SET=
dnl are we building for a win32 target environment? dnl are we building for a win32 target environment?
dnl If so, setup common stuff needed for both GUI and Base libs. dnl If so, setup common stuff needed for both GUI and Base libs.
if test "$USE_WIN32" = 1 ; then if test "$USE_WIN32" = 1 ; then
AC_CHECK_HEADER(w32api.h,,, [ ]) AC_CHECK_HEADERS(w32api.h,,, [ ])
AC_CHECK_HEADER(windows.h,, AC_CHECK_HEADER(windows.h,,
[ [
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
@@ -3852,8 +3852,8 @@ dnl do this after test for X11 above so that we have a chance of finding Xlib.h
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
dnl defines HAVE_X11_XKBLIB_H dnl defines HAVE_X11_XKBLIB_H
AC_CHECK_HEADER(X11/Xlib.h,,, [ ]) AC_CHECK_HEADERS(X11/Xlib.h,,, [ ])
AC_CHECK_HEADER([X11/XKBlib.h],,, AC_CHECK_HEADERS([X11/XKBlib.h],,,
[ [
#if HAVE_X11_XLIB_H #if HAVE_X11_XLIB_H
#include <X11/Xlib.h> #include <X11/Xlib.h>
@@ -3936,7 +3936,7 @@ dnl ---------------------------------------------------------------------------
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_CHECK_HEADER([X11/extensions/xf86vmode.h], AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
[ [
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
], ],
@@ -4680,7 +4680,7 @@ if test "$wxUSE_UNICODE" = yes; then
#include <wchar.h>" #include <wchar.h>"
case "${host}" in case "${host}" in
*-*-solaris2* ) *-*-solaris2* )
AC_CHECK_HEADER(widec.h,,, [AC_INCLUDES_DEFAULT()]) AC_CHECK_HEADERS(widec.h,,, [AC_INCLUDES_DEFAULT()])
if test "$ac_cv_header_widec_h" = "yes"; then if test "$ac_cv_header_widec_h" = "yes"; then
wchar_headers="$wchar_headers wchar_headers="$wchar_headers
#include <widec.h>" #include <widec.h>"
@@ -5047,7 +5047,7 @@ dnl ------------------------------------------
dnl Check for ESD: dnl Check for ESD:
EXTRALIBS_ESD= EXTRALIBS_ESD=
AC_CHECK_LIB(esd, esd_close, [ AC_CHECK_LIB(esd, esd_close, [
AC_CHECK_HEADER([esd.h], [ AC_CHECK_HEADERS([esd.h], [
EXTRALIBS_ESD="-lesd" EXTRALIBS_ESD="-lesd"
], ],
[], [],
@@ -5286,7 +5286,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
AC_DEFINE(wxHAVE_PTHREAD_CLEANUP) AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
fi fi
AC_CHECK_HEADER(sched.h,,, [AC_INCLUDES_DEFAULT()]) AC_CHECK_HEADERS(sched.h,,, [AC_INCLUDES_DEFAULT()])
if test "$ac_cv_header_sched_h" = "yes"; then if test "$ac_cv_header_sched_h" = "yes"; then
AC_CHECK_FUNC(sched_yield, AC_CHECK_FUNC(sched_yield,
AC_DEFINE(HAVE_SCHED_YIELD), AC_DEFINE(HAVE_SCHED_YIELD),
@@ -6529,7 +6529,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
dnl can't be compiled because of an error and with the default dnl can't be compiled because of an error and with the default
dnl AC_CHECK_HEADER semantics we'd still detect it in this case and dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
dnl build would fail later dnl build would fail later
AC_CHECK_HEADER(linux/joystick.h, [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()]) AC_CHECK_HEADERS(linux/joystick.h, [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
fi fi
fi fi
@@ -6666,7 +6666,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
-o "$wxUSE_CLIPBOARD" = "yes" \ -o "$wxUSE_CLIPBOARD" = "yes" \
-o "$wxUSE_OLE" = "yes" \ -o "$wxUSE_OLE" = "yes" \
-o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
AC_CHECK_HEADER(ole2.h,,, [ ]) AC_CHECK_HEADERS(ole2.h,,, [ ])
if test "$ac_cv_header_ole2_h" = "yes" ; then if test "$ac_cv_header_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then if test "$GCC" = yes ; then