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

diff --git a/configure.in b/configure.in
index cbae8a5..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-04-02-1230
+VERSION=2008-06-23-2005
 
 
 # ------------------------------------------------------------------
@@ -153,7 +153,7 @@ RFX_CHECK_MING
 SLEXT="so"
 if test "x${MINGW}" != "xyes"; then
     # no mingW
-    AC_DEFINE_UNQUOTED(O_BINARY, 0)
+    AC_DEFINE([O_BINARY], [0], [Not defined on mingw])
 else
     # mingW
     SLEXT="dll"
@@ -229,10 +229,11 @@ 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)
 
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+ 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])
+AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
@@ -246,7 +247,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
  AC_CHECK_TYPE(boolean,int) #needed for jpeglib
- AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time)
+ AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo)
 
 AC_CHECK_SIZEOF([signed])
 AC_CHECK_SIZEOF([unsigned])
@@ -259,17 +260,23 @@ 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_UNQUOTED(HAVE_LAME, 1)
+	AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library])
     else
 	if test -d /usr/include/lame; then
 	    CPPFLAGS="$CPPFLAGS -I /usr/include/lame"
@@ -281,11 +288,11 @@ else
 	AC_CHECK_LIB(mp3lame, lame_init,, NO_LIBMP3LAME=1)
 	AC_CHECK_HEADERS(lame.h)
 	if test "x$NO_LIBMP3LAME" "!=" "x1" -a "x$ac_cv_header_lame_h" "!=" "x";then
-	    AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
+	    AC_DEFINE([HAVE_LAME], [1])
 	fi
     fi
 fi
-AC_SUBST(lame_objects)
+AC_SUBST(lame_in_source)
 
 # ------------------------------------------------------------------
  
@@ -293,7 +300,7 @@ RFX_CHECK_AVI2SWF
 if test "x${AVIFILE}" = "xtrue"; then
     VIDEO_LIBS="$VIDEO_LIBS $AVIFILE_LIBS"
     VIDEO_CFLAGS="$VIDEO_CFLAGS $AVIFILE_CFLAGS"
-    AC_DEFINE_UNQUOTED(HAVE_AVIFILE, 1)
+    AC_DEFINE([HAVE_AVIFILE], [1], [Define if avifile is present])
 fi
 
 if test "x${WIN32}" != "x"; then
@@ -310,7 +317,7 @@ AC_SUBST(VIDEO_CFLAGS)
 # ------------------------------------------------------------------
 
 if test "x${UNCOMPRESS}" = "xgzip"; then
-    AC_DEFINE_UNQUOTED(USE_GZIP, 1)
+    AC_DEFINE([USE_GZIP], [1], [Define if gzip is present])
 fi
 AC_SUBST(USE_GZIP)
 
@@ -449,9 +456,43 @@ fi
 
 # ------------------------------------------------------------------
 
+AH_TOP([
+#ifndef __config_h__
+#define __config_h__
+])
+
+AH_BOTTOM([
+#ifdef HAVE_ZLIB_H
+#ifdef HAVE_LIBZ
+#define HAVE_ZLIB
+#endif
+#endif
+
+#ifdef HAVE_JPEGLIB_H
+#ifdef HAVE_LIBJPEG
+#define HAVE_JPEGLIB
+#endif
+#endif
+
+#ifdef HAVE_FT2BUILD_H
+#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__
+])
+
+
+
 if test -f "release.in"; then release_in="./release"; fi
-if test -f "wx/Makefile.in"; then wx_in="wx/Makefile"; fi
-FILES="$release_in $wx_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
+FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
 AC_OUTPUT(${FILES})
 
 dnl new autoconf