diff options
| author | Raimo Niskanen <[email protected]> | 2010-11-12 10:05:15 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-11-12 10:05:15 +0100 |
| commit | ffbde437305a5fe7bd48786d935ed01c1c42a0fa (patch) | |
| tree | c78b2208ad71a76143d0f4d166eaa8e6fa77de13 | |
| parent | 9e38e8708a83bea76b08b94a98d64c0e66eaca6c (diff) | |
| parent | e1a1f770062ac51e7c7aacb818c8a8b8f3753ab3 (diff) | |
| download | otp-ffbde437305a5fe7bd48786d935ed01c1c42a0fa.tar.gz otp-ffbde437305a5fe7bd48786d935ed01c1c42a0fa.tar.bz2 otp-ffbde437305a5fe7bd48786d935ed01c1c42a0fa.zip | |
Merge branch 'raimo/wxwidgets-configure-fixes' into dev
* raimo/wxwidgets-configure-fixes:
wxWidgets configure fixes
| -rwxr-xr-x | lib/wx/configure.in | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/lib/wx/configure.in b/lib/wx/configure.in index 855c0c975e..8f8c5ee123 100755 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -194,6 +194,36 @@ case $host_os in ;; esac +dnl +dnl Opengl tests +dnl + +if test X"$host_os" != X"win32" ; then + AC_CHECK_HEADERS([GL/gl.h], [], + [AC_CHECK_HEADERS([OpenGL/gl.h])]) + if test X"$ac_cv_header_GL_gl_h" != Xyes && + test X"$ac_cv_header_OpenGL_gl_h" != Xyes + then + saved_CPPFLAGS="$CPPFLAGS" + AC_MSG_NOTICE(Checking for OpenGL headers in /usr/X11R6) + CPPFLAGS="-isystem /usr/X11R6/include $CPPFLAGS" + $as_unset ac_cv_header_GL_gl_h + AC_CHECK_HEADERS([GL/gl.h]) + if test X"$ac_cv_header_GL_gl_h" != Xyes ; then + AC_MSG_NOTICE(Checking for OpenGL headers in /usr/local) + CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS" + $as_unset ac_cv_header_GL_gl_h + AC_CHECK_HEADERS([GL/gl.h]) + if test X"$ac_cv_header_GL_gl_h" != Xyes ; then + AC_MSG_WARN([No OpenGL headers found, wx will NOT be usable]) + CPPFLAGS="$saved_CPPFLAGS" + fi + fi + fi +else + AC_CHECK_HEADERS([gl/gl.h],[],[],[#include <windows.h>]) +fi + CXXFLAGS="$CFLAGS $CPPFLAGS" CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS" @@ -386,17 +416,6 @@ if test "$WXERL_CAN_BUILD_DRIVER" != "false"; then AC_SUBST(WX_HAVE_STATIC_LIBS) AC_SUBST(RC_FILE_TYPE) -dnl -dnl Opengl tests -dnl - -if test X"$host_os" != X"win32" ; then - AC_CHECK_HEADERS([GL/gl.h]) - AC_CHECK_HEADERS([OpenGL/gl.h]) -else - AC_CHECK_HEADERS([gl/gl.h],[],[],[#include <windows.h>]) -fi - AC_MSG_CHECKING(if wxwidgets have opengl support) AC_LANG_PUSH(C++) saved_CXXFLAGS=$CXXFLAGS |