Changeset 2546

Timestamp:

Sep 21, 2011 2:30:22 PM (12 years ago)

Author:

gah

Message:

update from trunk

File:

• trunk/packages/vizservers/configure.in (modified) (7 diffs)

trunk/packages/vizservers/configure.in

@@ -190 +190 @@
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS=$VTK_INC_SPEC
-AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_WARN([cannot find vtkSmartPointer.h])])
+AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_ERROR([cannot find VTK includes])])
 CPPFLAGS=$save_CPPFLAGS
 
@@ -200 +200 @@
 AC_CHECK_HEADERS([stdio.h unistd.h stdlib.h string.h sys/types.h])
 AC_CHECK_HEADERS([sys/socket.h sys/time.h netinet/in.h arpa/inet.h netdb.h])
-
-AC_CHECK_FUNCS([accept4])
 
 AC_MSG_CHECKING([for OpenDX headers])
@@ -216 +214 @@
 done
 if test "x${DX_INC_DIR}" = "x" ; then
-  AC_MSG_WARN([cannot find OpenDX include files])
-  DX_INC_SPEC=""
-elif test "${DX_INC_DIR}" = "/usr/include" ; then
+  AC_MSG_ERROR([cannot find OpenDX include files])
+fi
+
+if test "${DX_INC_DIR}" = "/usr/include" ; then
   DX_INC_SPEC=""
 else 
@@ -226 +225 @@
 
 DX_LIB_DIR=""
+found=no
 for dir in \
  /usr/lib \
@@ -244 +244 @@
   fi
 done
-if test "x${DX_LIB_DIR}" = "x" ; then
-  AC_MSG_WARN([cannot find OpenDX libraries])
+if test "x{$DX_LIB_DIR}" = "x" ; then
+  AC_MSG_ERROR([cannot find OpenDX libraries])
 fi
 
 AC_MSG_CHECKING([for libDXcallm library])
-if test "x${DX_LIB_DIR}" = "x" -o "${DX_LIB_DIR}" = "/usr/lib" -o "${DX_LIB_DIR}" = "/usr/lib64"; then
+if test "${DX_LIB_DIR}" = "/usr/lib" -o "${DX_LIB_DIR}" = "/usr/lib64"; then
   DX_LIB_SPEC=""
 else
@@ -257 +257 @@
 
 AC_CHECK_HEADERS([opencv/cv.h opencv/highgui.h])
-AC_CHECK_LIB([highgui], [cvLoadImage])
+AC_CHECK_LIB([cv], [cvLoadImage])
 
 save_CPPFLAGS=$CPPFLAGS
@@ -307 +307 @@
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="-I${CG_INC_DIR} $CPPFLAGS"
-AC_CHECK_HEADERS([Cg/cgGL.h], [], AC_MSG_WARN([cannot find nVidia Cg headers]))
+AC_CHECK_HEADERS([Cg/cgGL.h], [], AC_MSG_ERROR([cannot find nVidia Cg headers]))
 CPPFLAGS=$save_CPPFLAGS