Changeset 1903 for branches

Timestamp:

Aug 31, 2010, 9:26:51 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• configure (modified) (30 diffs)
• configure.in (modified) (1 diff)

branches/blt4/configure

@@ -598 +598 @@
 LIBOBJS
 subdirs
+HAVE_FFMPEG_LIBS
 LDFLAGS_DEFAULT
 CFLAGS_DEFAULT
@@ -607 +608 @@
 SHLIB_LDFLAGS
 RP_BASE
-DX_LIB_SPEC
-DX_INC_SPEC
 JAVA_INC_SPEC
 JAVA_INC_DIR
@@ -645 +644 @@
 PERL_INCLUDES
 PERL
+MKOCTFILE3
+MKOCTFILE2
 OCTAVE_VERSION_MAJOR
 OCTAVE_VERSION
+OCTAVE3
+OCTAVE2
+mkoctfile3
+octave3
+mkoctfile2
+octave2
 MKOCTFILE
 OCTAVE
@@ -760 +767 @@
 with_matlab
 with_octave
+with_octave2
+with_octave3
 with_perl
 with_python
@@ -1408 +1417 @@
   --with-matlab=DIR       location of matlab and mex compiler [default=yes]
   --with-octave=DIR       location of octave compiler MKOCTFILE [default=yes]
+  --with-octave2=DIR      location of octave compiler MKOCTFILE [default=no]
+  --with-octave3=DIR      location of octave compiler MKOCTFILE [default=no]
   --with-perl=DIR         location of perl [default=yes]
   --with-python=DIR       location of python [default=yes]
@@ -7189 +7200 @@
         TCLSH="$with_tclsh/bin/tclsh"
     else
-        if test -x "$with_tclsh"
+       if test -x "$with_tclsh"
         then
             echo Found tclsh in $with_tclsh
             TCLSH="$with_tclsh"
         else
-            # Extract the first word of "tclsh", so it can be a program name with args.
+            if test -x "${exec_prefix}/bin/tclsh"
+            then
+                echo Found tclsh in ${exec_prefix}/bin/tclsh
+                TCLSH="${exec_prefix}/bin/tclsh"
+            else
+                for v in 8.4 8.5 8.6 ; do
+                    if test -x "${exec_prefix}/bin/tclsh${v}"
+                    then
+                        echo Found tclsh in ${exec_prefix}/bin/tclsh${v}
+                        TCLSH="${exec_prefix}/bin/tclsh${v}"
+                        break
+                    fi
+                done
+            fi
+        fi
+    fi
+    if ! test -x ${TCLSH}
+    then
+        # Extract the first word of "tclsh", so it can be a program name with args.
 set dummy tclsh; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -7234 +7263 @@
 
 
-        fi
     fi
 fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${TCLSH}" >&5
 $as_echo "${TCLSH}" >&6; }
@@ -7290 +7319 @@
     do
       for vtk in $path/vtk-* ; do
-        if test -d "${vtk}" ; then
-          VTKDIR=${vtk}
-        fi
+        if test -d "${vtk}" ; then
+          VTKDIR=${vtk}
+        fi
       done
       if test "x${VTKDIR}" != "x" ; then
-        break
+        break
       fi
     done
@@ -7554 +7583 @@
 
 
+# Standard octave search (use the installed version of octave)
 
 # Check whether --with-octave was given.
@@ -7564 +7594 @@
 
 OCTAVE=
+OCTAVE2=
+OCTAVE3=
 OCTAVE_VERSION=
 OCTAVE_VERSION_MAJOR=
 MKOCTFILE=
+MKOCTFILE2=
+MKOCTFILE3=
 if test "$with_octave" != "no" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
@@ -7652 +7686 @@
 
   else
+    MKOCTFILE=$with_octave
+    OCTAVE=$with_octave
+  fi
+fi
+if test "x${OCTAVE}" != "x" ; then
+  OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
+  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+  if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
+    OCTAVE3=$OCTAVE
+    MKOCTFILE3=$MKOCTFILE
+  fi
+  if test "${OCTAVE_VERSION_MAJOR}" == "2" ; then
+    OCTAVE2=$OCTAVE
+    MKOCTFILE2=$MKOCTFILE
+  fi
+fi
+
+# Check if octave2 was designated *in addition* to the installed version.
+
+# Check whether --with-octave2 was given.
+if test "${with_octave2+set}" = set; then :
+  withval=$with_octave2; with_octave2=$withval
+else
+  with_octave2=no
+fi
+
+
+if test "$with_octave2" != "no" ; then
+  if test "$with_octave2" = "yes" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
+$as_echo_n "checking for octave and mkoctfile... " >&6; }
     # Extract the first word of "octave", so it can be a program name with args.
 set dummy octave; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OCTAVE+set}" = set; then :
+if test "${ac_cv_path_octave2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  case $OCTAVE in
+  case $octave2 in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_OCTAVE="$OCTAVE" # Let the user override the test with a path.
+  ac_cv_path_octave2="$octave2" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_octave/bin:$with_octave"
-for as_dir in $as_dummy
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -7672 +7736 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_OCTAVE="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_octave2="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7683 +7747 @@
 esac
 fi
-OCTAVE=$ac_cv_path_OCTAVE
-if test -n "$OCTAVE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE" >&5
-$as_echo "$OCTAVE" >&6; }
+octave2=$ac_cv_path_octave2
+if test -n "$octave2"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $octave2" >&5
+$as_echo "$octave2" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7697 +7761 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MKOCTFILE+set}" = set; then :
+if test "${ac_cv_path_mkoctfile2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  case $MKOCTFILE in
+  case $mkoctfile2 in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKOCTFILE="$MKOCTFILE" # Let the user override the test with a path.
+  ac_cv_path_mkoctfile2="$mkoctfile2" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_octave}/bin:${with_octave}"
-for as_dir in $as_dummy
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -7713 +7776 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MKOCTFILE="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_mkoctfile2="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7724 +7787 @@
 esac
 fi
-MKOCTFILE=$ac_cv_path_MKOCTFILE
-if test -n "$MKOCTFILE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
-$as_echo "$MKOCTFILE" >&6; }
+mkoctfile2=$ac_cv_path_mkoctfile2
+if test -n "$mkoctfile2"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile2" >&5
+$as_echo "$mkoctfile2" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7734 +7797 @@
 
 
+  else
+    octave2=$with_octave2
+    mkoctfile2=`dirname $with_octave2`/mkoctfile
   fi
-  if test "x${OCTAVE}" != "x" ; then
-    OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
-    OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+fi
+if test "x${octave2}" != "x" ; then
+  version=`${octave2} -v | grep version | cut -d' ' -f4`
+  version_major=`echo ${version} | cut -d'.' -f1`
+  if test "$version_major" = "2" ; then
+    OCTAVE2=$octave2
+    MKOCTFILE2=$mkoctfile2
   fi
 fi
+
+# Check if octave3 was designated *in addition* to the installed version.
+
+
+# Check whether --with-octave3 was given.
+if test "${with_octave3+set}" = set; then :
+  withval=$with_octave3; with_octave3=$withval
+else
+  with_octave3=no
+fi
+
+
+echo with_octave3=$with_octave3
+if test "$with_octave3" != "no" ; then
+  if test "$with_octave3" = "yes" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
+$as_echo_n "checking for octave and mkoctfile... " >&6; }
+    # Extract the first word of "octave", so it can be a program name with args.
+set dummy octave; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_octave3+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $octave3 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_octave3="$octave3" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_octave3="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+octave3=$ac_cv_path_octave3
+if test -n "$octave3"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $octave3" >&5
+$as_echo "$octave3" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    # Extract the first word of "mkoctfile", so it can be a program name with args.
+set dummy mkoctfile; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_mkoctfile3+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $mkoctfile3 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_mkoctfile3="$mkoctfile3" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+mkoctfile3=$ac_cv_path_mkoctfile3
+if test -n "$mkoctfile3"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile3" >&5
+$as_echo "$mkoctfile3" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    octave3=$with_octave3
+    mkoctfile3=`dirname $with_octave3`/mkoctfile
+  fi
+fi
+
+echo octave3=$octave3
+if test "x${octave3}" != "x" ; then
+  echo version="${octave3} -v | grep version | cut -d' ' -f4"
+  version=`${octave3} -v | grep version | cut -d' ' -f4`
+  echo version=$version
+  version_major=`echo ${version} | cut -d'.' -f1`
+  echo version_major=$version_major
+  if test "$version_major" = "3" ; then
+    OCTAVE3=$with_octave3
+    MKOCTFILE3=$mkoctfile3
+  fi
+fi
+
+
+
+
+
 
 
@@ -8040 +8230 @@
 
 
-with_ruby="yes"
+rappture_with_ruby="yes"
 
 RUBY=""
@@ -8048 +8238 @@
 # Check whether --with-ruby was given.
 if test "${with_ruby+set}" = set; then :
-  withval=$with_ruby; with_ruby=$with_val
-fi
-
-if test "${with_ruby}" != "no" ; then
-  if test "${with_ruby}" = "yes" ; then
+  withval=$with_ruby; rappture_with_ruby=$with_val
+fi
+
+if test "${rappture_with_ruby}" != "no" ; then
+  if test "${rappture_with_ruby}" = "yes" ; then
     # Extract the first word of "ruby", so it can be a program name with args.
 set dummy ruby; ac_word=$2
@@ -8107 +8297 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_ruby}/bin/ruby:${with_ruby}"
+as_dummy="${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}"
 for as_dir in $as_dummy
 do
@@ -8458 +8648 @@
 
 
-with_java="yes"
+rappture_with_java="yes"
 JAVA=""
 JAVAH=""
@@ -8464 +8654 @@
 JAVA_DEV_PKG="no"
 
-JDK=
-JAVA_HOME=
-JAVA_INC_DIR=
-JAVA_INC_SPEC=
-
-# If java exists, let's look for the jni.h file.
-if test "x${JAVA}" != "x" ; then
-  for d in \
-   ${with_java} \
-   /usr/lib/jvm/java-6-sun \
-   /apps/java/jdk1.6.0_01 \
-   /opt/icedtea6-* \
-   /opt/sun-jdk-1.6* \
-   /opt/sun-jdk-1.5*
-  do
-    if test -r "${d}/include/jni.h" ; then
-      JDK=${d}
-      break;
-    fi
-  done
-  JAVA_HOME=$JDK
-  JAVA_INC_DIR=${JDK}/include
-  JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
-fi
-
 
 # Check whether --with-java was given.
 if test "${with_java+set}" = set; then :
-  withval=$with_java; with_java=$with_val
-fi
-
-if test "${with_java}" != "no" ; then
-  if test "${with_java}" = "yes" ; then
+  withval=$with_java; rappture_with_java=$with_val
+fi
+
+if test "${rappture_with_java}" != "no" ; then
+  if test "${rappture_with_java}" = "yes" ; then
     # Extract the first word of "java", so it can be a program name with args.
 set dummy java; ac_word=$2
@@ -8631 +8796 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_java}/bin:${with_java}"
+as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
 for as_dir in $as_dummy
 do
@@ -8672 +8837 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_java}/bin:${with_java}"
+as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
 for as_dir in $as_dummy
 do
@@ -8713 +8878 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_java}/bin:${with_java}"
+as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
 for as_dir in $as_dummy
 do
@@ -8743 +8908 @@
   fi
 fi
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenDX headers" >&5
-$as_echo_n "checking for OpenDX headers... " >&6; }
-DX_INC_DIR=""
-for dir in \
- /apps/rappture/include \
- /usr/dx/include \
- /usr/include
-do
-  if test -r "${dir}/dx/dx.h" ; then
-    DX_INC_DIR="$dir"
-    break
-  fi
-done
-
-if test "${DX_INC_DIR}" = "/usr/include" ; then
-  DX_INC_SPEC=""
-else
-  DX_INC_SPEC="-I{DX_INC_DIR}"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${DX_INC_DIR}" >&5
-$as_echo "${DX_INC_DIR}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenDX libraries" >&5
-$as_echo_n "checking for OpenDX libraries... " >&6; }
-DX_LIB_DIR=""
-for dir in \
- /apps/rappture/lib \
- /usr/lib/dx/lib_linux \
- /usr/dx/lib_linux \
- /usr/lib
-do
-  if test -r "${dir}/libDXcallm.a" ; then
-    DX_LIB_DIR="$dir"
-    break
-  fi
-done
-
-if test "${DX_LIB_DIR}" = "/usr" ; then
-  DX_LIB_SPEC=""
-else
-  DX_LIB_SPEC="-L${DX_LIB_DIR}"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${DX_LIB_DIR}" >&5
-$as_echo "${DX_LIB_DIR}" >&6; }
+JDK=
+JAVA_HOME=
+JAVA_INC_DIR=
+JAVA_INC_SPEC=
+
+# If java exists, let's look for the jni.h file.
+if test "x${JAVA}" != "x" ; then
+  for d in \
+   /apps/java/jdk1.6.0_01 \
+   /usr/lib/jvm/*sun-1.6* \
+   /opt/sun-jdk-1.6* \
+   /opt/icedtea6-* \
+   /opt/sun-jdk-1.5* \
+   /usr/lib/jvm/*sun-1.5*
+  do
+    if test -r "${d}/include/jni.h" ; then
+      JDK=${d}
+      break;
+    fi
+  done
+  JAVA_HOME=$JDK
+  JAVA_INC_DIR=${JDK}/include
+  JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
+fi
+
+
+
+
+
+
+
 
 RP_BASE=`pwd`
@@ -9291 +9432 @@
 
 
-if test "${SHARED_BUILD}" = "1" ; then
-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
-else
-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
-fi
+
+#--------------------------------------------------------------------
+# search for ffmpeg libraries libavcodec, libavformat, libswscale
+#--------------------------------------------------------------------
+
+for ac_header in ffmpeg/avcodec.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_AVCODEC_H
+  # include <ffmpeg/avcodec.h>
+  #endif
+
+"
+if test "x$ac_cv_header_ffmpeg_avcodec_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FFMPEG_AVCODEC_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in libavcodec/avcodec.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBAVCODEC_AVCODEC_H
+  # include <libavcodec/avcodec.h>
+  #endif
+
+"
+if test "x$ac_cv_header_libavcodec_avcodec_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVCODEC_AVCODEC_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in ffmpeg/avformat.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/avformat.h" "ac_cv_header_ffmpeg_avformat_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_AVFORMAT_H
+  # include <ffmpeg/avformat.h>
+  #endif
+
+"
+if test "x$ac_cv_header_ffmpeg_avformat_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FFMPEG_AVFORMAT_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in libavformat/avformat.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+  # include <libavformat/avformat.h>
+  #endif
+
+"
+if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in ffmpeg/avutil.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/avutil.h" "ac_cv_header_ffmpeg_avutil_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_AVUTIL_H
+  # include <ffmpeg/avutil.h>
+  #endif
+
+"
+if test "x$ac_cv_header_ffmpeg_avutil_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FFMPEG_AVUTIL_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in libavutil/avutil.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBAVUTIL_AVUTIL_H
+  # include <libavutil/avutil.h>
+  #endif
+
+"
+if test "x$ac_cv_header_libavutil_avutil_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVUTIL_AVUTIL_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in ffmpeg/swscale.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/swscale.h" "ac_cv_header_ffmpeg_swscale_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_SWSCALE_H
+  # include <ffmpeg/swscale.h>
+  #endif
+
+"
+if test "x$ac_cv_header_ffmpeg_swscale_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FFMPEG_SWSCALE_H 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in libswscale/swscale.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "libswscale/swscale.h" "ac_cv_header_libswscale_swscale_h" "#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBSWSCALE_SWSCALE_H
+  # include <libswscale/swscale.h>
+  #endif
+
+"
+if test "x$ac_cv_header_libswscale_swscale_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSWSCALE_SWSCALE_H 1
+_ACEOF
+
+fi
+
+done
+
+
+HAVE_FFMPEG_LIBS=""
+if [ \( "${ac_cv_header_ffmpeg_avcodec_h}" = "yes" -o \
+        "${ac_cv_header_libavcodec_avcodec_h}" = "yes" \) -a \
+     \( "${ac_cv_header_ffmpeg_avformat_h}" = "yes" -o \
+        "${ac_cv_header_libavformat_avformat_h}" = "yes" \) -a \
+     \( "${ac_cv_header_ffmpeg_avutil_h}" = "yes" -o \
+        "${ac_cv_header_libavutil_avutil_h}" = "yes" \) -a \
+     \( "${ac_cv_header_ffmpeg_swscale_h}" = "yes" -o \
+        "${ac_cv_header_libswscale_swscale_h}" = "yes" \) ] ; then
+  HAVE_FFMPEG_LIBS="yes"
+
+$as_echo "#define BUILD_with_ffmpeg 1" >>confdefs.h
+
+else
+  HAVE_FFMPEG_LIBS=""
+fi
+
+for ac_func in img_convert
+do :
+  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
+if test "x$ac_cv_func_img_convert" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IMG_CONVERT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in sws_scale
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
+if test "x$ac_cv_func_sws_scale" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_SCALE 1
+_ACEOF
+
+fi
+done
+
+
 
 ac_configure_args="--disable-threads --enable-shared"
@@ -9303 +9628 @@
 
 
-ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile instant/Makefile instant/irappture lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/RpOctaveInterface.h lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/filechoice/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
+ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile instant/Makefile instant/irappture lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/filechoice/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -10023 +10348 @@
     "lang/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES lang/matlab/Makefile" ;;
     "lang/octave/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/Makefile" ;;
-    "lang/octave/RpOctaveInterface.h") CONFIG_FILES="$CONFIG_FILES lang/octave/RpOctaveInterface.h" ;;
+    "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;;
+    "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;;
     "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;;
     "lang/ruby/build.rb") CONFIG_FILES="$CONFIG_FILES lang/ruby/build.rb" ;;
@@ -10051 +10377 @@
     "examples/app-fermi/wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/Makefile" ;;
     "examples/app-fermi/wrapper/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/cee/Makefile" ;;
+    "examples/app-fermi/wrapper/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/perl/Makefile" ;;
     "examples/app-fermi/wrapper/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/python/Makefile" ;;
     "examples/app-fermi/wrapper/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/tcl/Makefile" ;;

branches/blt4/configure.in

@@ -865 +865 @@
     examples/zoo/enable/Makefile
     examples/zoo/field/Makefile
-    examples/zoo/filelist/Makefile
+    examples/zoo/filechoice/Makefile
     examples/zoo/group/Makefile
     examples/zoo/image/Makefile