Changeset 2092

Timestamp:

Feb 10, 2011 12:58:23 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• configure (modified) (10 diffs)
• nanovis/nvconf.h.in (modified) (1 diff)

trunk/packages/vizservers/configure

@@ -606 +606 @@
 LD_RPATH
 CG_DIR
+FF_INC_SPEC
 DX_LIB_SPEC
 DX_INC_SPEC
@@ -706 +707 @@
 ac_user_opts='
 enable_option_checking
+with_tcllib
+with_rappture
 enable_64bit
 enable_64bit_vis
@@ -711 +714 @@
 enable_load
 with_x
-with_tcllib
-with_rappture
 '
       ac_precious_vars='build_alias
@@ -1351 +1352 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-x                use the X Window System
   --with-tcllib=DIR       location of Tcl binary library libtclstubs.a
                           [default=/usr/lib]
   --with-rappture=DIR     location of rappture files lib/librappture2.a and
                           include/rappture2/rappture2.h [default=/usr]
+  --with-x                use the X Window System
 
 Some influential environment variables:
@@ -2618 +2619 @@
 
 ac_config_headers="$ac_config_headers nanovis/nvconf.h nanoscale/config.h"
+
+
+
+
+# Check whether --with-tcllib was given.
+if test "${with_tcllib+set}" = set; then :
+  withval=$with_tcllib; with_tcllib=$withval
+else
+  with_tcllib=""
+fi
+
+
+
+# Check whether --with-rappture was given.
+if test "${with_rappture+set}" = set; then :
+  withval=$with_rappture; with_rappture=$withval
+else
+  with_rappture=/usr
+fi
 
 
@@ -7945 +7965 @@
 
 
-
-# Check whether --with-tcllib was given.
-if test "${with_tcllib+set}" = set; then :
-  withval=$with_tcllib; with_tcllib=$withval
-else
-  with_tcllib=""
-fi
-
-
 #
 # Need to check for the following dependencies:
@@ -7996 +8007 @@
 
 
-
-
-
-# Check whether --with-rappture was given.
-if test "${with_rappture+set}" = set; then :
-  withval=$with_rappture; with_rappture=$withval
-else
-  with_rappture=/usr
-fi
 
 
@@ -8228 +8230 @@
 
 
-for ac_header in <opencv/cv.h opencv/highgui.h
+for ac_header in opencv/cv.h opencv/highgui.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -8287 +8289 @@
 
 
+save_CPPFLAGS=$CPPFLAGS
+# Test for redhat-specific location of ffmpeg headers.
+if test -d "/usr/include/ffmpeg" ; then
+  CPPFLAGS="$CPPFLAGS -I/usr/include/ffmpeg"
+  FF_INC_SPEC="-I/usr/include/ffmpeg"
+fi
+
+
 for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h
 do :
@@ -8309 +8319 @@
 
 done
+
+CPPFLAGS=$save_CPPFLAGS
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5

trunk/packages/vizservers/nanovis/nvconf.h.in

@@ -51 +51 @@
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the <opencv/cv.h> header file. */
+#undef HAVE_OPENCV_CV_H
 
 /* Define to 1 if you have the <opencv/highgui.h> header file. */