OpenGL detection compilation fixes

From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/configure b/configure
index b88e3a8a41f3e47614a4d0869e3a98c8a8ec9e6f..2366aa60266b0b2ae0a2e5d01fce871f47409c30 100755 (executable)
--- a/configure
+++ b/configure
@@ -719,7 +719,7 @@ cat > $TMPC << EOF
 #endif
 int main( void ) { return (int) glGetString(GL_EXTENSIONS); }
 EOF
-if $cc -o $TMPE `$sdl_config --cflags --libs 2> /dev/null` -I/usr/include/GL $TMPC -lXext -lGL 2> /dev/null
+if $cc $ARCH_CFLAGS -o $TMPE `$sdl_config --cflags --libs 2> /dev/null` -I/usr/include/GL $TMPC -lXext -lGL 2> /dev/null
 then
 opengl="yes"
 else
@@ -1109,6 +1109,14 @@ then
     echo "SDL_LIBS+=-lXext" >> $config_mak
     echo "SDL_LIBS+=-lGL" >> $config_mak
 fi
+if test $opengl = "yes"
+then
+    echo "#define CONFIG_OPENGL 1" >> $config_h
+    echo "CONFIG_OPENGL=yes" >> $config_mak
+    echo "SDL_CFLAGS+=-I/usr/include/GL" >> $config_mak
+    echo "SDL_LIBS+=-lXext" >> $config_mak
+    echo "SDL_LIBS+=-lGL" >> $config_mak
+fi
 if test "$cocoa" = "yes" ; then
   echo "#define CONFIG_COCOA 1" >> $config_h
   echo "CONFIG_COCOA=yes" >> $config_mak