[<fayjf@us...>]

Revision: 742
          http://freeglut.svn.sourceforge.net/freeglut/?rev=742&view=rev
Author:   fayjf
Date:     2008-07-21 15:00:51 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
Implementing a patch from Jocelyn Frechot (thank you, Jocelyn) that "should enable the XInput extension management with the autotools."  See e-mail of Sun 7/20/2008 12:01 PM.

Modified Paths:
--------------
    trunk/freeglut/freeglut/configure.ac
    trunk/freeglut/freeglut/src/Makefile.am

Modified: trunk/freeglut/freeglut/configure.ac
===================================================================
--- trunk/freeglut/freeglut/configure.ac	2008-07-10 15:17:10 UTC (rev 741)
+++ trunk/freeglut/freeglut/configure.ac	2008-07-21 15:00:51 UTC (rev 742)
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([freeglut library], [2.4.0], [freeglut-bugs@...], [freeglut])
+AC_INIT([freeglut library], [2.6.0], [freeglut-bugs@...], [freeglut])
 AM_INIT_AUTOMAKE
 AC_PREREQ([2.56])
 AC_CONFIG_SRCDIR([AUTHORS])
@@ -23,6 +23,7 @@
 if test x"$no_x" = xyes; then
   GL_LIBS="-lopengl32 -lglu32 -lgdi32"
   LIBXXF86VM=
+  LIBXI=
   VERSION_INFO=
   EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
 else
@@ -30,11 +31,13 @@
   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])
 
@@ -45,6 +48,7 @@
 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
 AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
+AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
 CPPFLAGS="$save_CPPFLAGS"
 
 # Checks for library functions.

Modified: trunk/freeglut/freeglut/src/Makefile.am
===================================================================
--- trunk/freeglut/freeglut/src/Makefile.am	2008-07-10 15:17:10 UTC (rev 741)
+++ trunk/freeglut/freeglut/src/Makefile.am	2008-07-21 15:00:51 UTC (rev 742)
@@ -42,7 +42,7 @@
 #
 # Additional linker flags
 #	 
-lib@...@_la_LIBADD  = $(LIBM) $(X_LIBS) $(GL_LIBS) $(LIBXXF86VM)
+lib@...@_la_LIBADD  = $(LIBM) $(X_LIBS) $(GL_LIBS) $(LIBXXF86VM) $(LIBXI)
 lib@...@_la_LDFLAGS = $(VERSION_INFO)
 lib@...@_la_CFLAGS  = $(X_CFLAGS) $(EXPORT_FLAGS)
 lib@...@_la_CPPFLAGS= -I$(top_srcdir)/include


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.