Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Albert Gräf
Gem
Commits
5f2ce2ed
Commit
5f2ce2ed
authored
Jul 21, 2014
by
IOhannes m zmoelnig
Browse files
fix AX_CHECK_GLUT as well
parent
cd026ec6
Changes
1
Hide whitespace changes
Inline
Side-by-side
m4/ax_check_glut.m4
View file @
5f2ce2ed
...
...
@@ -116,7 +116,7 @@ AC_DEFUN([_AX_CHECK_GLUT_HEADERS],
CFLAGS="${GLUT_CFLAGS} ${CFLAGS}"
# see comment in _AX_CHECK_GL_INCLUDES_DEFAULT
AC_CHECK_HEADERS([windows.h],[],[],[AC_INCLUDES_DEFAULT])
AC_CHECK_HEADERS([GL/glut.h
Open
GL/glut.h],
AC_CHECK_HEADERS([GL/glut.h GL
UT
/glut.h],
[ax_check_glut_have_headers="yes";break],
[ax_check_glut_have_headers_headers="no"],
[_AX_CHECK_GLUT_INCLUDES_DEFAULT()])
...
...
@@ -125,6 +125,24 @@ AC_DEFUN([_AX_CHECK_GLUT_HEADERS],
AC_LANG_POP([C])
])
# dnl try to find lib under darwin
AC_DEFUN([_AX_CHECK_GLUT_MANUAL_LIBS_DARWIN],
[dnl
AC_LANG_PUSH([C])
_AX_CHECK_GLUT_SAVE_FLAGS()
CFLAGS="${GLUT_CFLAGS} ${CFLAGS}"
LIBS="${GLUT_LIBS} ${LIBS}"
LDFLAGS="-framework GLUT ${GLUT_LDFLAGS} ${LDFLAGS}"
AC_LINK_IFELSE([_AX_CHECK_GLUT_PROGRAM],
[ax_check_glut_lib_opengl="yes"
GLUT_LDFLAGS="-framework GLUT ${GLUT_LDFLAGS}"
],
[ax_check_glut_lib_opengl="no"])
_AX_CHECK_GLUT_RESTORE_FLAGS()
AC_LANG_PUSH([C])
])
# dnl try to found library (generic case)
# dnl $1 is set to the library to found
AC_DEFUN([_AX_CHECK_GLUT_MANUAL_LIBS_GENERIC],
...
...
@@ -158,8 +176,8 @@ AC_DEFUN([_AX_CHECK_GLUT_MANUAL_LIBS],
[AC_REQUIRE([AC_CANONICAL_HOST])
GLUT_LIBS="${GLUT_LIBS} ${GLU_LIBS}"
AS_CASE([${host}],
# try
first cyg
win version
[*-
cyg
win*],[_AX_CHECK_GLUT_MANUAL_LIBS_
GENERIC([GLUT glut MesaGLUT freeglut freeglut32 glut32]
)],
# try
Dar
win version
[*-
dar
win*],[_AX_CHECK_GLUT_MANUAL_LIBS_
DARWIN(
)],
# try first native
[*-mingw*],[_AX_CHECK_GLUT_MANUAL_LIBS_GENERIC([glut32 GLUT glut MesaGLUT freeglut freeglut32])],
[_AX_CHECK_GLUT_MANUAL_LIBS_GENERIC([GLUT glut freeglut MesaGLUT])])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment