Stripped out tabs and end-of-line whitespace

[freeglut] / configure.in

diff --git a/configure.in b/configure.in
index f525baf..b770b55 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(freeglut,2.0.1)
+AM_INIT_AUTOMAKE(freeglut,2.2.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -35,15 +35,40 @@ dnl Checks for library functions.
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
+dnl Build time configuration
+
+AC_ARG_ENABLE(replace-glut,
+[  --disable-replace-glut  Coexist with existing glut library])
+if test "x$enable_replace_glut" != xno
+then
+ LIBRARY=glut
+ HEADER=glut.h
+else
+ LIBRARY=freeglut
+ HEADER=
+fi
+AC_SUBST(LIBRARY)
+AC_SUBST(HEADER)
+
+AC_ARG_ENABLE(warnings,
+[  --enable-warnings       Enable gcc compiler warnings],
+if test "x$GCC" == xyes
+then
+ CFLAGS="$CFLAGS -Wall -Wno-parentheses -Werror"
+fi)
+
 AC_OUTPUT(\
        Makefile \
        doc/Makefile \
        progs/Makefile \
        progs/demos/Makefile \
+       progs/demos/CallbackMaker/Makefile \
        progs/demos/Fractals/Makefile \
        progs/demos/Fractals_random/Makefile \
        progs/demos/Lorenz/Makefile \
        progs/demos/One/Makefile \
+       progs/demos/offscreen/Makefile \
+       progs/demos/shapes/Makefile \
        src/Makefile \
        include/Makefile \
        include/GL/Makefile \