Improve autoconf magic: To detect headers like GL/gl.h, it might be

necessary to temporarily use the X11 flags found by AC_PATH_XTRA.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@676 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2005-07-13 12:05:33 +00:00
parent e802d0e918
commit fa640f9356
2 changed files with 6 additions and 4 deletions

View File

@ -1123,3 +1123,6 @@ extensions.
for some bit-fiddling, anyway. for some bit-fiddling, anyway.
(292) Avoid gcc warnings for some joystick code (e.g. on Solaris). (292) Avoid gcc warnings for some joystick code (e.g. on Solaris).
(293) Improve autoconf magic: To detect headers like GL/gl.h, it might be
necessary to temporarily use the X11 flags found by AC_PATH_XTRA.

View File

@ -40,13 +40,12 @@ AC_SUBST([EXPORT_FLAGS])
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h]) AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
AC_HEADER_TIME AC_HEADER_TIME
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>]) AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
CFLAGS="$save_CFLAGS" CPPFLAGS="$save_CPPFLAGS"
# Checks for library functions. # Checks for library functions.
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL