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

moved X11/XKBlib.h test after main X11 tests

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-30 23:30:06 +00:00
parent aca2d2de32
commit 2971ea9d51
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.in
View File

@@ -1724,19 +1724,6 @@ case "${host}" in
;; ;;
esac esac
if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
dnl defines HAVE_X11_XKBLIB_H
AC_CHECK_HEADERS(X11/Xlib.h)
AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
[
#if HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif
])
fi
fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Checks for compiler characteristics dnl Checks for compiler characteristics
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -3377,6 +3364,20 @@ dnl ---------------------------------------------------------------------------
dnl Optional libraries included when system library is not used dnl Optional libraries included when system library is not used
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
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_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
dnl defines HAVE_X11_XKBLIB_H
AC_CHECK_HEADERS(X11/Xlib.h)
AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
[
#if HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif
])
fi
fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl iODBC support dnl iODBC support