Implementing the new menu context variable names in Windows ...

[freeglut] / configure.ac

diff --git a/configure.ac b/configure.ac
index d6f5f06..440c2db 100644 (file)
--- 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.3.9], [freeglut-bugs@lists.sourceforge.net], [freeglut])
+AC_INIT([freeglut library], [2.4.0], [freeglut-bugs@lists.sourceforge.net], [freeglut])
 AM_INIT_AUTOMAKE
 AC_PREREQ([2.56])
 AC_CONFIG_SRCDIR([AUTHORS])
@@ -19,10 +19,24 @@ AC_SUBST([LIBTOOL_DEPS])
 
 # Checks for libraries.
 AC_PATH_XTRA
-AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
-            [LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
-             [$X_LIBS -lXext -lX11])
+
+if test x"$no_x" = xyes; then
+  GL_LIBS="-lopengl32 -lglu32 -lgdi32"
+  LIBXXF86VM=
+  VERSION_INFO=
+  EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
+else
+  GL_LIBS="-lGL -lGLU -lXext -lX11"
+  AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
+               [LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
+               [$X_LIBS -lXext -lX11])
+  VERSION_INFO="-version-info 11:0:8"
+  EXPORT_FLAGS=
+fi
+AC_SUBST([GL_LIBS])
 AC_SUBST([LIBXXF86VM])
+AC_SUBST([VERSION_INFO])
+AC_SUBST([EXPORT_FLAGS])
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -61,6 +75,13 @@ if test "x$enable_warnings" != xno -a "x$GCC" = xyes; then
   CFLAGS="$CFLAGS -Wall -pedantic -Werror"
 fi
 
+AC_ARG_ENABLE([debug],
+[AS_HELP_STRING([--enable-debug],
+                [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
+
 # Generate output.
 AC_CONFIG_FILES([Makefile
                  doc/Makefile