Permalink
Browse files

Fix configure checks for Boost and GL

  • Loading branch information...
1 parent 5b02e59 commit 403e0993ced039b6a6850bbbfe5be87254ea05cf @nickg committed May 2, 2011
Showing with 35 additions and 1 deletion.
  1. +28 −0 config.h.in
  2. +5 −0 configure.ac
  3. +2 −1 src/Makefile.am
View
@@ -13,6 +13,9 @@
/* define if the Boost::Filesystem library is available */
#undef HAVE_BOOST_FILESYSTEM
+/* define if the Boost::System library is available */
+#undef HAVE_BOOST_SYSTEM
+
/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
@@ -28,6 +31,12 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
+/* Define to 1 if you have the <GL/glu.h> header file. */
+#undef HAVE_GL_GLU_H
+
+/* Define to 1 if you have the <GL/gl.h> header file. */
+#undef HAVE_GL_GL_H
+
/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
@@ -53,9 +62,18 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
+/* Define to 1 if you have the <OpenGL/glu.h> header file. */
+#undef HAVE_OPENGL_GLU_H
+
+/* Define to 1 if you have the <OpenGL/gl.h> header file. */
+#undef HAVE_OPENGL_GL_H
+
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
@@ -96,6 +114,12 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Use nonstandard varargs form for the GLU tesselator callback */
+#undef HAVE_VARARGS_GLU_TESSCB
+
+/* Define to 1 if you have the <windows.h> header file. */
+#undef HAVE_WINDOWS_H
+
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
@@ -124,6 +148,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to necessary symbol if this constant uses a non-standard name on
+ your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
View
@@ -36,6 +36,11 @@ AC_CHECK_HEADERS([libintl.h unistd.h])
dnl Check for Boost
AX_BOOST_BASE(1.33)
AX_BOOST_FILESYSTEM
+AX_BOOST_SYSTEM
+
+dnl Check for OpenGL
+AX_CHECK_GL
+AX_CHECK_GLU
dnl Check for SDL
SDL_VERSION=1.2.5
View
@@ -2,7 +2,8 @@ bin_PROGRAMS = lander
# Add -pg for profiling
AM_CXXFLAGS=$(LANDER_CFLAGS) $(SDL_CFLAGS) -Wall
-AM_LDFLAGS=$(LANDER_LIBS) $(SDL_LIBS) $(BOOST_FILESYSTEM_LIB) -lGLU $(LTLIBINTL)
+AM_LDFLAGS=$(LANDER_LIBS) $(SDL_LIBS) $(BOOST_FILESYSTEM_LIB) \
+ $(BOOST_SYSTEM_LIB) $(GL_LIBS) $(GLU_LIBS) $(LTLIBINTL)
lander_SOURCES = Main.cpp Game.hpp Game.cpp \
Font.cpp Font.hpp HighScores.cpp HighScores.hpp Input.cpp \
Input.hpp Platform.hpp GraphicsFwd.hpp \

0 comments on commit 403e099

Please sign in to comment.