X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=dc6c813761703ab787e11edef39de267f97eeb38;hp=79ee3334d6b05c5484152a0078da07c07043b10f;hb=fe03062883881dcd0e1b8d65d676433d17973477;hpb=85f6f8c3250642f2b5e3e241fac1a573778989a9

diff --git a/configure.in b/configure.in
index 79ee333..dc6c813 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
 
 PACKAGE=swftools
-VERSION=2008-06-08-1156
+VERSION=2008-06-23-2005
 
 
 # ------------------------------------------------------------------
@@ -229,6 +229,7 @@ dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
  AC_HEADER_DIRENT
  AC_HEADER_STDC
+
  AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h)
 
 AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
@@ -259,14 +260,20 @@ RFX_CHECK_FREETYPE
 
 RFX_CHECK_FONTCONFIG
 
-lame_objects= 
+RFX_CHECK_OPENGL
+if test "$HAVE_OPENGL";then
+    DEVICE_OPENGL='devices/opengl.$(O)'
+    AC_SUBST(DEVICE_OPENGL)
+fi
+
+lame_in_source= 
 lame_makefile=
 if test "x${DISABLE_LAME}" = "xtrue"; then
     echo "*" Disabling lame support...
 else
     # old lame code at lib/lame
     if test -f lib/lame/Makefile.in; then
-	lame_objects="lame/psymodel.\$(O) lame/fft.\$(O) lame/newmdct.\$(O) lame/quantize.\$(O) lame/takehiro.\$(O) lame/reservoir.\$(O) lame/quantize_pvt.\$(O) lame/vbrquantize.\$(O) lame/encoder.\$(O) lame/id3tag.\$(O) lame/version.\$(O) lame/tables.\$(O) lame/util.\$(O) lame/bitstream.\$(O) lame/set_get.\$(O) lame/VbrTag.\$(O) lame/lame.\$(O)"
+	lame_in_source='$(lame_objects)'
 	lame_makefile="lib/lame/Makefile"
 	CPPFLAGS="$CPPFLAGS -Ilame"
 	AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library])
@@ -285,7 +292,7 @@ else
 	fi
     fi
 fi
-AC_SUBST(lame_objects)
+AC_SUBST(lame_in_source)
 
 # ------------------------------------------------------------------
  
@@ -471,6 +478,14 @@ AH_BOTTOM([
 #define HAVE_FREETYPE_H 1
 #endif
 
+#ifdef HAVE_GL_GL_H
+#ifdef HAVE_GL_GLUT_H
+#ifdef HAVE_OPENGL
+#define USE_OPENGL
+#endif
+#endif
+#endif
+
 #endif // __config_h__
 ])