Mercurial > octave

comparison aclocal.m4 @ 7954:3ffc34caec65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure fixes
author John W. Eaton <jwe@octave.org>
date Mon, 21 Jul 2008 11:47:30 -0400
parents 456578a22388
children 80a715c4824d
comparison
equal deleted inserted replaced
7953:efabe34cce70 7954:3ffc34caec65
1064 *-*-msdosmsvc) 1064 *-*-msdosmsvc)
1065 AC_CHECK_HEADERS(windows.h) 1065 AC_CHECK_HEADERS(windows.h)
1066 ;; 1066 ;;
1067 esac 1067 esac
1068 have_opengl_incs=no 1068 have_opengl_incs=no
1069 AC_CHECK_HEADERS(GL/gl.h OpenGL/gl.h, [ 1069 AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], [
1070 AC_CHECK_HEADERS(GL/glu.h OpenGL/glu.h, [ 1070 AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], [
1071 have_opengl_incs=yes, break], [], [ 1071 have_opengl_incs=yes; break], [], [
1072 #ifdef HAVE_WINDOWS_H 1072 #ifdef HAVE_WINDOWS_H
1073 # include <windows.h> 1073 #include <windows.h>
1074 #endif ]), break], [], [ 1074 #endif
1075 ])
1076 break
1077 ], [], [
1075 #ifdef HAVE_WINDOWS_H 1078 #ifdef HAVE_WINDOWS_H
1076 # include <windows.h> 1079 #include <windows.h>
1077 #endif]) 1080 #endif
1081 ])
1078 if test "$have_opengl_incs" = "yes"; then 1082 if test "$have_opengl_incs" = "yes"; then
1079 case $canonical_host_type in 1083 case $canonical_host_type in
1080 *-*-msdosmsvc) 1084 *-*-msdosmsvc)
1081 save_LIBS="$LIBS" 1085 save_LIBS="$LIBS"
1082 LIBS="$LIBS -lopengl32" 1086 LIBS="$LIBS -lopengl32"
1083 AC_MSG_CHECKING([for glEnable in -lopengl32]) 1087 AC_MSG_CHECKING([for glEnable in -lopengl32])
1084 AC_TRY_LINK([ 1088 AC_TRY_LINK([
1085 #if HAVE_WINDOWS_H 1089 #if HAVE_WINDOWS_H
1086 # include <windows.h> 1090 #include <windows.h>
1087 #endif 1091 #endif
1088 #include <GL/gl.h>], [ 1092 #if defined (HAVE_GL_GL_H)
1093 #include <GL/gl.h>
1094 #elif defined (HAVE_OPENGL_GL_H)
1095 #include <OpenGL/gl.h>
1096 #endif
1097 ], [
1089 glEnable(GL_SMOOTH);], OPENGL_LIBS="-lopengl32 -lglu32") 1098 glEnable(GL_SMOOTH);], OPENGL_LIBS="-lopengl32 -lglu32")
1090 LIBS="$save_LIBS" 1099 LIBS="$save_LIBS"
1091 if test "x$OPENGL_LIBS" != "x"; then 1100 if test "x$OPENGL_LIBS" != "x"; then
1092 AC_MSG_RESULT(yes) 1101 AC_MSG_RESULT(yes)
1093 else 1102 else