fixed logging bug in giflib detection

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index 638471f..89bd3b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,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=2004-11-03-1856
+VERSION=2005-01-21-2006
 
 
 # ------------------------------------------------------------------
@@ -106,7 +106,17 @@ fi
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
 
 dnl Checks for system services
- AC_EXEEXT
+OBJEXT="o"
+AREXT=".a"
+
+AC_EXEEXT
+
+if test "x$EXEEXT" = "x.exe";then
+    OBJEXT="obj"
+    AREXT=".lib"
+fi
+AC_SUBST(OBJEXT)
+AC_SUBST(AREXT)
 
 RFX_CHECK_MING
 
@@ -143,6 +153,10 @@ if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/l
     # TODO- test whether gcc still works after this
 fi
 
+#Mac OS:
+#LDFLAGS "-L/sw/lib" ; CPPFLAGS "-I/sw/include -I/sw/include/lame"
+
+
 # this must be done after (I believe) AC_PROG_MAKE_SET
 if test "x$DEBUG" '!=' "x";then
     STRIP="@echo debug enabled, not stripping "
@@ -158,6 +172,7 @@ dnl Checks for libraries.
  AC_CHECK_LIB(z, deflate,, ZLIBMISSING=true)
  AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, JPEGLIBMISSING=true)
  AC_CHECK_LIB(t1, T1_LoadFont,, T1LIBMISSING=true)
+ AC_CHECK_LIB(ungif, EGifOpenFileName,, UNGIFMISSING=true)
 
 RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
@@ -170,7 +185,7 @@ dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.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_CHECK_HEADERS(zlib.h gif_lib.h jpeglib.h t1lib.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")
@@ -212,7 +227,7 @@ if test "x${DISABLE_LAME}" = "xtrue"; then
 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_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_makefile="lib/lame/Makefile"
        CPPFLAGS="$CPPFLAGS -Ilame"
        AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
@@ -290,6 +305,11 @@ fi
 if test "x$T1LIBMISSING" = "xtrue";then
     MISSINGLIBS="${MISSINGLIBS} t1lib"
 fi
+if test "x$UNGIFMISSING" = "xtrue";then
+    DISABLEGIF2SWF=true
+    MISSINGLIBS="${MISSINGLIBS} ungif"
+    PARTIAL=true
+fi
 
 if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
     DISABLEPDF2SWF=true;
@@ -305,6 +325,11 @@ fi
 if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
     MISSINGLIBS="${MISSINGLIBS} t1lib.h"
 fi
+if test "x${ac_cv_header_gif_lib_h}" '!=' "xyes"; then
+    DISABLEGIF2SWF=true
+    MISSINGLIBS="${MISSINGLIBS} gif_lib.h"
+    PARTIAL=true
+fi
 if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
     DISABLEPNG2SWF=true;
     MISSINGLIBS="${MISSINGLIBS} zlib.h"
@@ -353,6 +378,14 @@ fi
 export JPEG2SWF
 AC_SUBST(JPEG2SWF)
 
+GIF2SWF='gif2swf$(E)'
+if test "x${DISABLEGIF2SWF}" = "xtrue"; then
+  echo "* Disabling gif2swf tool..."
+  GIF2SWF=
+fi
+export GIF2SWF
+AC_SUBST(GIF2SWF)
+
 PNG2SWF='png2swf$(E)'
 if test "x${DISABLEPNG2SWF}" = "xtrue"; then
   echo "* Disabling png2swf tool..."