look for OpenGL headers/libraries in /opt/graphics/OpenGL as this is where they're found on HP-UX systems apparently (closes bug 925307)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-11-04 17:33:37 +00:00
parent 1113475f03
commit 02b0502025
2 changed files with 29 additions and 34 deletions

51
configure vendored

File diff suppressed because one or more lines are too long

View File

@ -3875,11 +3875,9 @@ if test "$wxUSE_OPENGL" = "yes"; then
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
else
dnl David Elliott: Without this snippet AC_CHECK_HEADER fails to find
dnl GL/gl.h on Mac OS X where it is located in
dnl /usr/X11R6/include/GL/gl.h:
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
dnl adjust CPPFLAGS to include GL/gl.h location if necessary
dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /opt/graphics/OpenGL/include], GL/gl.h)
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found in $ac_find_includes)
WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
@ -3891,9 +3889,9 @@ if test "$wxUSE_OPENGL" = "yes"; then
found_gl=0
AC_MSG_CHECKING([for -lGL])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL)
if test "$ac_find_libraries" != "" ; then
AC_MSG_RESULT([yes])
AC_MSG_RESULT([found in $ac_find_libraries])
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
if test "$ac_path_to_link" != " -L/usr/lib" ; then