Commit 942e1f04 authored by bonnell's avatar bonnell
Browse files

Fix hdf4 build for vtk-6.1

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23126 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0990c51f
......@@ -1073,13 +1073,13 @@ diff -c a/configure hdf-4.2.5/configure
done
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk_jpeg_start_decompress in -lvtkjpeg-6.0" >&5
! $as_echo_n "checking for vtk_jpeg_start_decompress in -lvtkjpeg-6.0... " >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk_jpeg_start_decompress in -lvtkjpeg-${VTK_SHORT_VERSION}" >&5
! $as_echo_n "checking for vtk_jpeg_start_decompress in -lvtkjpeg-${VTK_SHORT_VERSION}... " >&6; }
! if test "${ac_cv_lib_jpeg_vtk_jpeg_start_decompress+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
! LIBS="-lvtkjpeg-6.0 $LIBS"
! LIBS="-lvtkjpeg-${VTK_SHORT_VERSION} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
......@@ -1155,7 +1155,7 @@ diff -c a/configure hdf-4.2.5/configure
#define HAVE_LIBJPEG 1
_ACEOF
! LIBS="-lvtkjpeg-6.0 $LIBS"
! LIBS="-lvtkjpeg-${VTK_SHORT_VERSION} $LIBS"
else
unset HAVE_JPEG
......@@ -1178,13 +1178,13 @@ diff -c a/configure hdf-4.2.5/configure
LDFLAGS="$LDFLAGS -L$jpeg_lib"
fi
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk_jpeg_start_decompress in -lvtkjpeg-6.0" >&5
! $as_echo_n "checking for vtk_jpeg_start_decompress in -lvtkjpeg-6.0... " >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk_jpeg_start_decompress in -lvtkjpeg-${VTK_SHORT_VERSION}" >&5
! $as_echo_n "checking for vtk_jpeg_start_decompress in -lvtkjpeg-${VTK_SHORT_VERSION}... " >&6; }
! if test "${ac_cv_lib_jpeg_vtk_jpeg_start_decompress+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
! LIBS="-lvtkjpeg-6.0 $LIBS"
! LIBS="-lvtkjpeg-${VTK_SHORT_VERSION} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
......@@ -1260,7 +1260,7 @@ diff -c a/configure hdf-4.2.5/configure
#define HAVE_LIBJPEG 1
_ACEOF
! LIBS="-lvtkjpeg-6.0 $LIBS"
! LIBS="-lvtkjpeg-${VTK_SHORT_VERSION} $LIBS"
else
unset HAVE_JPEG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment