X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=aclocal.m4;h=d304e4e72aa3b4f4c9e9124ca4f17b125a2b531b;hb=6a2d6287e6a46e7ad0a0ff0cee1b95882fa2475d;hp=224949bbd4f9dd18994df70e96bbe788c7006883;hpb=307c661a552a7140a28c5b76f484985fbfd3e982;p=swftools.git

diff --git a/aclocal.m4 b/aclocal.m4
index 224949b..d304e4e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -51,12 +51,12 @@ AC_TRY_RUN([
 #include "stdlib.h"
 int main (int argc, char*argv[])
 {
-    return system("echo `touch config.tmp2`");
+    return system("test `touch config.tmp2`");
 }
 ], OK=OK,,CROSSCOMPILE=1)
 
 if test "x${OK}" = "xOK";then
-    test -e config.tmp2 || OK=
+    test -f config.tmp2 || OK=
 fi
 
 if test "x${CROSSCOMPILE}" = "x1";then
@@ -65,10 +65,94 @@ fi
 if test "x${OK}" = "xOK";then
 rm -f config.tmp2
 AC_MSG_RESULT(yes)
-export SYSTEM_BACKTICKS=1
+SYSTEM_BACKTICKS=1
+export SYSTEM_BACKTICKS
 AC_DEFINE_UNQUOTED(SYSTEM_BACKTICKS, 1)
 else
 AC_MSG_RESULT(no)
 fi
 ])
 
+AC_DEFUN(SWF_CHECK_AVI2SWF,
+[
+AC_MSG_CHECKING([whether we can compile the avifile test program])
+
+cat > conftest.$ac_ext << EOF
+#include <avifile/version.h>
+#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION==6) 
+   #include <avifile.h>
+   #include <aviplay.h>
+   #include <fourcc.h>
+   #include <creators.h>
+   #include <StreamInfo.h>
+   #define VERSION6
+#else
+   #include <avifile.h>
+   #include <aviplay.h>
+   #include <aviutil.h>
+   #define Width width
+   #define Height height
+   #define Data data
+   #define Bpp bpp
+#endif
+
+int main (int argc, char*argv[])
+{
+  IAviReadFile* player;
+  IAviReadStream* astream;
+  IAviReadStream* vstream;
+  player = CreateIAviReadFile(0);
+  astream = player->GetStream(0, AviStream::Audio);
+  vstream = player->GetStream(0, AviStream::Video);
+  vstream -> StartStreaming();
+  astream -> StartStreaming();
+#ifndef VERSION6
+  MainAVIHeader head;
+  player->GetFileHeader(&head);
+  head.dwMicroSecPerFrame;
+  head.dwTotalFrames;
+  head.dwStreams;
+  head.dwWidth;
+  head.dwHeight;
+  head.dwMicroSecPerFrame;
+  astream->GetEndPos(),
+  astream->GetEndTime());
+  player->StreamCount();
+#else
+  StreamInfo*audioinfo;
+  StreamInfo*videoinfo;
+  audioinfo = astream->GetStreamInfo();
+  videoinfo = vstream->GetStreamInfo();
+  videoinfo->GetVideoWidth();
+  videoinfo->GetVideoHeight();
+  audioinfo->GetAudioSamplesPerSec();
+  videoinfo->GetFps();
+#endif
+  CImage*img = vstream->GetFrame();
+  img->ToRGB();
+  img->Data();
+  img->Bpp();
+  img->Width();
+  img->Height();
+  WAVEFORMATEX wave;
+  astream->GetAudioFormatInfo(&wave,0);
+  uint_t a,b;
+  astream->ReadFrames(0,0,0,a,b);
+}
+EOF
+
+ac_link='g++ `avifile-config --cflags` `avifile-config --libs` conftest.$ac_ext -o conftest${ac_exeext}'
+if {(eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  AC_MSG_RESULT(yes)
+  AVIFILE=true
+  export AVIFILE
+  AC_DEFINE_UNQUOTED(AVIFILE, true)
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  AC_MSG_RESULT(no)
+fi
+rm -f conftest*
+])
+
+