Changeset 2558 for branches/blt4/packages/vizservers/configure

Timestamp:

Sep 21, 2011 9:37:11 PM (11 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/packages/vizservers/configure (modified) (9 diffs)

branches/blt4/packages/vizservers/configure

@@ -2632 +2632 @@
 
 
-with_vtk="yes"
-with_vtk_libs=""
-with_vtk_includes=""
-with_rappture=""
-with_tcllib=""
-with_rappture="yes"
-
 
 # Check whether --with-tcllib was given.
@@ -2662 +2655 @@
   withval=$with_vtk_includes; with_vtk_includes=$withval
 else
-  with_vtk_includes=/usr/include/vtk-5.6
+  with_vtk_includes=""
 fi
 
@@ -2671 +2664 @@
   withval=$with_vtk_libs; with_vtk_libs=$withval
 else
-  with_vtk_libs=/usr/lib/vtk-5.6
+  with_vtk_libs=""
 fi
 
@@ -8033 +8026 @@
 fi
 
-RP2_INCL_DIR=""
 RP_DIR=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rappture" >&5
@@ -8041 +8033 @@
     if test -r "$dir/include/rappture2/rappture2.h" -a \
      -r "$dir/lib/librappture.a"; then
-      RP_INCL_SPEC="-I$dir/include"
       RP_DIR="$dir"
+      RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
       RP_LIB_DIR="$dir/lib"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
@@ -8050 +8042 @@
   done
 else
-  if test -d "$with_rappture" ; then
+  if test ! -d "$with_rappture" ; then
     as_fn_error $? "--with-rappture: no such directory $with_rappture" "$LINENO" 5
   fi
-  RP_LIB=$with_rappture
-  RP_INCL_SPEC="-I$with_rappture/include"
+  RP_DIR=$with_rappture
+  RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
   RP_LIB_DIR="$with_rappture/lib"
 fi
@@ -8089 +8081 @@
 if test "x$with_vtk_libs" != "x"; then
    VTK_LIB_DIR=$with_vtk_libs
+   VTK_LIB_SPEC="-L$with_vtk_libs"
 fi
 
@@ -8493 +8486 @@
 fi
 
+for ac_func in avformat_alloc_context
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
+if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_ALLOC_CONTEXT 1
+_ACEOF
+
+fi
+done
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_free in -lavutil" >&5
 $as_echo_n "checking for av_free in -lavutil... " >&6; }
@@ -8570 +8574 @@
 CG_LIB_DIR="$dir/lib"
 
-echo CGDIR=$CG_DIR
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="-I${CG_INC_DIR} $CPPFLAGS"