X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=configure.ac;h=8e835d5099667f1a58ab70bda09289ad05b76657;hb=5b3d339481bac6dbaeb599bffc1325f716585bfe;hp=5daea877b4990361f3950170cd20361ff88e61e3;hpb=2f298f1a2059a1e193309ab6b583005dbbc2c6ec;p=freeglut

diff --git a/configure.ac b/configure.ac
index 5daea87..8e835d5 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], [3.0.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
@@ -20,31 +21,80 @@ AC_SUBST([LIBTOOL_DEPS])
 # Checks for libraries.
 AC_PATH_XTRA
 
-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
+#if test "x$no_x" = xyes; then
+#  GL_LIBS="-lopengl32 -lgdi32 -lwinmm"
+#  LIBXXF86VM=
+#  LIBXI=
+#  VERSION_INFO=
+#  EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
+#else
+#  GL_LIBS="-lGL -lXext -lX11"
+#  AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode])
+#  AC_CHECK_LIB([Xrandr], [XRRQueryExtension])
+#  AC_CHECK_LIB([Xi], [XISelectEvents])
+#  LIBXI=-lXi
+#  VERSION_INFO="-version-info 12:0:9"
+#  EXPORT_FLAGS=
+#fi
+VERSION_INFO="-version-info 12:0:9"
+AM_CONDITIONAL(TARGET_HOST_MS_WINDOWS, false)
+AM_CONDITIONAL(TARGET_HOST_POSIX_X11, false)
+AM_CONDITIONAL(TARGET_HOST_ANDROID, false)
+case "${host}" in
+    *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+	# Windows+Cygwin/MSYS, MinGW cross-compilation
+	GL_LIBS="-lopengl32 -lgdi32 -lwinmm"
+	LIBXXF86VM=
+	LIBXI=
+	CPPFLAGS="$CPPFLAGS -DFREEGLUT_EXPORTS"
+	AM_CONDITIONAL(TARGET_HOST_MS_WINDOWS, true)
+	;;
+    *-*-linux-androideabi)
+	# Android
+	# e.g. arm-unknown-linux-androideabi
+	GL_LIBS="-lEGL -lGLESv2"
+	LIBXXF86VM=
+	LIBXI=
+	#CFLAGS="$CFLAGS"
+	# '-mandroid' is not mandatory but doesn't hurt
+	# '-O0 -gstabs+' helps the currently buggy GDB port, better
+	#   remove it for releases
+	# '-DANDROID' is the Android build system convention
+	CFLAGS="-mandroid -O0 -gstabs+"
+	CPPFLAGS="$CPPFLAGS -DANDROID"
+	AM_CONDITIONAL(TARGET_HOST_ANDROID, true)
+	;;
+    *)
+	# Unix/X11
+	GL_LIBS="-lGL -lXext -lX11"
+	AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode])
+	AC_CHECK_LIB([Xrandr], [XRRQueryExtension])
+	AC_CHECK_LIB([Xi], [XISelectEvents])
+	LIBXI=-lXi
+	AM_CONDITIONAL(TARGET_HOST_POSIX_X11, true)
+	;;
+esac
+
 AC_SUBST([GL_LIBS])
 AC_SUBST([LIBXXF86VM])
+AC_SUBST([LIBXI])
 AC_SUBST([VERSION_INFO])
 AC_SUBST([EXPORT_FLAGS])
 
+AC_CHECK_LIB([usbhid], [hid_init],
+             [LIBUSBHID=-lusbhid], [LIBUSBHID=])
+AC_SUBST(LIBUSBHID)
+
 # 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_CHECK_HEADERS([usbhid.h libusbhid.h errno.h GL/gl.h GL/glu.h GL/glx.h GLES/gl.h GLES2/gl2.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
 AC_HEADER_TIME
 AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
+AC_CHECK_HEADERS([X11/extensions/Xrandr.h])
+AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
+AC_CHECK_HEADERS([X11/extensions/XInput2.h])
 CPPFLAGS="$save_CPPFLAGS"
 
 # Checks for library functions.
@@ -52,6 +102,8 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_VPRINTF
 AC_CHECK_LIBM
 AC_SUBST([LIBM])
+AC_CHECK_FUNCS([gettimeofday])
+AC_CHECK_FUNCS([vfprintf])
 
 # Build time configuration.
 AC_ARG_ENABLE([replace-glut],
@@ -71,7 +123,14 @@ 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],
@@ -82,17 +141,22 @@ if test "x$enable_debug" = xyes; then
 fi
 
 # Generate output.
-AC_CONFIG_FILES([Makefile
-                 doc/Makefile
-                 include/GL/Makefile
-                 include/Makefile
-                 progs/Makefile
-                 progs/demos/CallbackMaker/Makefile
-                 progs/demos/Fractals/Makefile
-                 progs/demos/Fractals_random/Makefile
-                 progs/demos/Lorenz/Makefile
-                 progs/demos/Makefile
-                 progs/demos/One/Makefile
-                 progs/demos/shapes/Makefile
-                 src/Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	doc/Makefile
+	include/GL/Makefile
+	include/Makefile
+	progs/Makefile
+	progs/demos/CallbackMaker/Makefile
+	progs/demos/Fractals/Makefile
+	progs/demos/Fractals_random/Makefile
+	progs/demos/Lorenz/Makefile
+	progs/demos/Makefile
+	progs/demos/One/Makefile
+	progs/demos/shapes/Makefile
+	progs/demos/smooth_opengl3/Makefile
+	progs/demos/spaceball/Makefile
+	progs/demos/subwin/Makefile
+	src/Makefile
+])
 AC_OUTPUT