X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=aclocal.m4;h=d304e4e72aa3b4f4c9e9124ca4f17b125a2b531b;hb=6a2d6287e6a46e7ad0a0ff0cee1b95882fa2475d;hp=9869169a6fd788907bbcfe3c4cf932ec22a098f4;hpb=8011e13e57219e2ffe5fd1398719d16482419b0e;p=swftools.git

diff --git a/aclocal.m4 b/aclocal.m4
index 9869169..d304e4e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -12,11 +12,9 @@ export CROSSCOMPILE
 
 if test "x${CROSSCOMPILE}" = "x1"; then
  AC_MSG_RESULT(we are cross compiling- trying to guess from system type)
- AC_MSG_CHECKING(for system type)
- systemguess=`./config.guess`
- AC_MSG_RESULT(${systemguess})
+ AC_CANONICAL_SYSTEM
  AC_MSG_CHECKING([for byte order, try 2])
- case "${systemguess}" in
+ case "${target}" in
   *86* | *-pc-* )
      LITTLEENDIAN=1
      ;;
@@ -46,3 +44,115 @@ exit 1
 fi
 ])
 
+AC_DEFUN(SWF_CHECK_SYSTEM_BACKTICKS,
+[
+AC_MSG_CHECKING([whether system() can handle command substitution])
+AC_TRY_RUN([
+#include "stdlib.h"
+int main (int argc, char*argv[])
+{
+    return system("test `touch config.tmp2`");
+}
+], OK=OK,,CROSSCOMPILE=1)
+
+if test "x${OK}" = "xOK";then
+    test -f config.tmp2 || OK=
+fi
+
+if test "x${CROSSCOMPILE}" = "x1";then
+    OK=OK;
+fi
+if test "x${OK}" = "xOK";then
+rm -f config.tmp2
+AC_MSG_RESULT(yes)
+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*
+])
+
+