configure option for external libart (patch from Patrice Dumas)

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index fcff549..e39a0d7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,9 +19,11 @@ AC_ARG_ENABLE(optimizations,
 [  --enable-optimizations  turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true)
 AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
+AC_ARG_WITH([external-libart],
+[  --with-external-libart  use external libart library (at your own risk)], [EXTERNAL_LIBART=true])
 
 PACKAGE=swftools
-VERSION=2008-06-08-1156
+VERSION=2008-06-23-2005
 
 
 # ------------------------------------------------------------------
@@ -229,6 +231,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 +262,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 +294,25 @@ else
        fi
     fi
 fi
-AC_SUBST(lame_objects)
+AC_SUBST(lame_in_source)
+
+art_in_source='$(art_objects)'
+AC_DEFINE([INTERNAL_LIBART], [1], [use internal libart library])
+
+if test "x$EXTERNAL_LIBART" = "xtrue"; then
+    art_in_source=
+    PKG_CHECK_MODULES([LIBART],[libart-2.0],,[libart_pkgconfig_libart=no])
+    if test "x$libart_pkgconfig_libart" = "xno"; then
+        AC_CHECK_HEADERS([libart_lgpl/libart.h],[
+           AC_CHECK_LIB([art_lgpl_2],[art_new],,[])
+        ],[AC_MSG_ERROR([No libart library found. This library is required.])])
+    else
+       CPPFLAGS="$CPPFLAGS $LIBART_CFLAGS"
+        AC_DEFINE([INTERNAL_LIBART], [0])
+        LIBS="$LIBS $LIBART_LIBS"
+    fi
+fi
+AC_SUBST([art_in_source])
 
 # ------------------------------------------------------------------
  
@@ -471,14 +498,21 @@ 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__
 ])
 
 
 
 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