Added autoconf detection for the xf86 vid mode extentions.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@151 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/configure.in b/configure.in
index 3934b1f..be9d6ce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,10 +16,19 @@ AC_SUBST(LIBTOOL_DEPS)
 dnl Checks for libraries.
 AC_PATH_XTRA
 
+AC_CHECK_LIB(Xxf86vm,XF86VidModeSwitchToMode,
+       LIBXXF86VM=-lXxf86vm,LIBXXF86VM=,$X_LIBS -lXext -lX11)
+AC_SUBST(LIBXXF86VM)
+
 dnl Checks for header files.
 AC_STDC_HEADERS
 AC_HAVE_HEADERS( GL/gl.h GL/glu.h GL/glx.h )
 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $X_CFLAGS"
+AC_CHECK_HEADERS( X11/extensions/xf86vmode.h )
+CFLAGS="$save_CFLAGS"
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.

diff --git a/src/Makefile.am b/src/Makefile.am
index a933e64..473ccac 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ libglut_la_SOURCES = freeglut_callbacks.c \
 #
 # Additional linker flags
 #       
-libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 -lXxf86vm
+libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
 libglut_la_LDFLAGS = -version-info 11:0:8
 
 #

diff --git a/src/freeglut_glutfont_definitions.c b/src/freeglut_glutfont_definitions.c
index 7cb34f8..8154774 100644 (file)
--- a/src/freeglut_glutfont_definitions.c
+++ b/src/freeglut_glutfont_definitions.c
@@ -61,16 +61,16 @@ struct freeglutBitmapFont
 } ; 
 
 
-struct freeglutStrokeFont *glutStrokeRoman ;
-struct freeglutStrokeFont *glutStrokeMonoRoman ;
+struct freeglutStrokeFont glutStrokeRoman ;
+struct freeglutStrokeFont glutStrokeMonoRoman ;
 
-struct freeglutBitmapFont *glutBitmap9By15 ;
-struct freeglutBitmapFont *glutBitmap8By13 ;
-struct freeglutBitmapFont *glutBitmapTimesRoman10 ;
-struct freeglutBitmapFont *glutBitmapTimesRoman24 ;
-struct freeglutBitmapFont *glutBitmapHelvetica10 ;
-struct freeglutBitmapFont *glutBitmapHelvetica12 ;
-struct freeglutBitmapFont *glutBitmapHelvetica18 ;
+struct freeglutBitmapFont glutBitmap9By15 ;
+struct freeglutBitmapFont glutBitmap8By13 ;
+struct freeglutBitmapFont glutBitmapTimesRoman10 ;
+struct freeglutBitmapFont glutBitmapTimesRoman24 ;
+struct freeglutBitmapFont glutBitmapHelvetica10 ;
+struct freeglutBitmapFont glutBitmapHelvetica12 ;
+struct freeglutBitmapFont glutBitmapHelvetica18 ;
 
 #endif
 

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 796a7d7..70c845f 100644 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -89,10 +89,8 @@
     #include <X11/Xatom.h>
     #include <X11/keysym.h>
 
-    #ifndef __sgi
-      #ifndef SOLARIS
+    #if HAVE_X11_EXTENSIONS_XF86VMODE_H
         #include <X11/extensions/xf86vmode.h>
-      #endif
     #endif
 #endif