X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=configure.ac;h=5daea877b4990361f3950170cd20361ff88e61e3;hb=a14928fc505633d395e18db84ce7dbfd7386fa5f;hp=45ba8ccfbab3e028762466ce3690121c05f9d42a;hpb=3d093218232559989253aaa1f22c5e1523e0c811;p=freeglut

diff --git a/configure.ac b/configure.ac
index 45ba8cc..5daea87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,14 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([freeglut library], [2.2.0], [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.59])
+AC_PREREQ([2.56])
 AC_CONFIG_SRCDIR([AUTHORS])
 AC_CONFIG_HEADERS([config.h])
 
+# Compatibility hack for older autoconf versions
+m4_ifdef([AS_HELP_STRING], [], [AC_DEFUN([AS_HELP_STRING], [AC_HELP_STRING($][@)])])
+
 # Checks for programs.
 AC_PROG_CC
 AC_C_CONST
@@ -16,20 +19,33 @@ 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
-AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h errno.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
+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"
+CPPFLAGS="$save_CPPFLAGS"
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
@@ -58,6 +74,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