X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=configure.ac;h=5aa4bf3ed6f7ea54baeeeb9a589149df75ab0522;hb=5732d430c4543ca520d3ac2f6ef3e339bb393f04;hp=e69114b63dcb4a40c2f38edae53d8e5849aba2d5;hpb=2f3b4dff063aff6f3e28d6d3e0eafdc41375e005;p=freeglut

diff --git a/configure.ac b/configure.ac
index e69114b..5aa4bf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([freeglut library], [2.4.0], [freeglut-bugs@lists.sourceforge.net], [freeglut])
+AC_INIT([freeglut library], [2.6.0], [freeglut-bugs@lists.sourceforge.net], [freeglut])
 AM_INIT_AUTOMAKE
 AC_PREREQ([2.56])
 AC_CONFIG_SRCDIR([AUTHORS])
@@ -11,6 +11,7 @@ m4_ifdef([AS_HELP_STRING], [], [AC_DEFUN([AS_HELP_STRING], [AC_HELP_STRING($][@)
 
 # Checks for programs.
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_C_CONST
 AC_EXEEXT
 AC_LIBTOOL_DLOPEN
@@ -23,6 +24,7 @@ AC_PATH_XTRA
 if test x"$no_x" = xyes; then
   GL_LIBS="-lopengl32 -lglu32 -lgdi32"
   LIBXXF86VM=
+  LIBXI=
   VERSION_INFO=
   EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
 else
@@ -30,23 +32,25 @@ else
   AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
                [LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
                [$X_LIBS -lXext -lX11])
+  LIBXI=-lXi
   VERSION_INFO="-version-info 11:0:8"
   EXPORT_FLAGS=
 fi
 AC_SUBST([GL_LIBS])
 AC_SUBST([LIBXXF86VM])
+AC_SUBST([LIBXI])
 AC_SUBST([VERSION_INFO])
 AC_SUBST([EXPORT_FLAGS])
 
 # Checks for header files.
 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_HEADER_TIME
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $X_CFLAGS"
 AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
-CFLAGS="$save_CFLAGS"
+AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
+CPPFLAGS="$save_CPPFLAGS"
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
@@ -72,13 +76,19 @@ AC_ARG_ENABLE([warnings],
 [AS_HELP_STRING([--enable-warnings],
                 [use all gcc compiler warnings @<:@default=yes@:>@])])
 if test "x$enable_warnings" != xno -a "x$GCC" = xyes; then
-  CFLAGS="$CFLAGS -Wall -pedantic -Werror"
+  CFLAGS="$CFLAGS -Wall -pedantic"
+fi
+
+AC_ARG_ENABLE([warnings-as-errors],
+[AS_HELP_STRING([--enable-warnings-as-errors],
+                [make all warnings into errors @<:@default=no@:>@])])
+if test "x$enable_warnings_as_errors" = xyes -a "x$GCC" = xyes; then
+  CFLAGS="$CFLAGS -Werror"
 fi
 
 AC_ARG_ENABLE([debug],
 [AS_HELP_STRING([--enable-debug],
-                [enable debug (for developers) @<:@default=no@:>@])])
-
+                [enable debugging code (for developers) @<:@default=no@:>@])])
 if test "x$enable_debug" = xyes; then
   AC_DEFINE([_DEBUG], [1], [Define to 1 if you want to include debugging code.])
 fi