projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allowing recent change to build on older versions of MSVC per e-mail from Eero Pajarr...
[freeglut]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
2b8d043
..
9ee3c67
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-22,13
+22,13
@@
AC_SUBST([LIBTOOL_DEPS])
AC_PATH_XTRA
if test x"$no_x" = xyes; then
AC_PATH_XTRA
if test x"$no_x" = xyes; then
- GL_LIBS="-lopengl32 -lglu32 -lgdi32 -lwinmm"
+ GL_LIBS="-lopengl32 -lgdi32 -lwinmm"
LIBXXF86VM=
LIBXI=
VERSION_INFO=
EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
else
LIBXXF86VM=
LIBXI=
VERSION_INFO=
EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
else
- GL_LIBS="-lGL -lGLU -lXext -lX11"
+ GL_LIBS="-lGL -lXext -lX11"
AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
[LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
[$X_LIBS -lXext -lX11])
AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
[LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
[$X_LIBS -lXext -lX11])
@@
-46,7
+46,7
@@
AC_SUBST([EXPORT_FLAGS])
AC_HEADER_STDC
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
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([usbhid.h errno.h 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_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
AC_HEADER_TIME
AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
@@
-95,5
+95,5
@@
if test "x$enable_debug" = xyes; then
fi
# Generate output.
fi
# Generate output.
-AC_CONFIG_FILES([Makefile doc/Makefile include/GL/Makefile include/Makefile progs/Makefile progs/demos/CallbackMaker/Makefile progs/demos/Fractals/Makefile progs/demos/Fractals_random/Makefile progs/demos/Lorenz/Makefile progs/demos/Makefile progs/demos/One/Makefile progs/demos/shapes/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile include/GL/Makefile include/Makefile progs/Makefile progs/demos/CallbackMaker/Makefile progs/demos/Fractals/Makefile progs/demos/Fractals_random/Makefile progs/demos/Lorenz/Makefile progs/demos/Makefile progs/demos/One/Makefile progs/demos/shapes/Makefile progs/demos/smooth_opengl3/Makefile progs/demos/spaceball/Makefile src/Makefile])
AC_OUTPUT
AC_OUTPUT