Commit f8645725 authored by hrchilds's avatar hrchilds

Remove libGLU from Volume plot dependencies unless SLIVR is linked in.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7183 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3b5e5d03
......@@ -3736,7 +3736,7 @@ _ACEOF
BUILD_SLIVR="slivr"
SLIVR_INCLUDE="-I$""(TOPDIR)/include/teem -I$""(TOPDIR)/include/slivr"
SLIVR_LIBS="-lslivrV -lslivrG -lnrrd -lair -lbiff -lhest"
SLIVR_LIBS="-lslivrV -lslivrG -lnrrd -lair -lbiff -lhest -lGLU"
if test "$UNAME" = "Darwin"; then
TEEM_CMAKE_C_FLAGS="-D CMAKE_C_FLAGS:STRING=-fno-common"
SLIVR_CMAKE_SHARED_LINKER_FLAGS="-D CMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,-undefined,dynamic_lookup"
......@@ -5938,14 +5938,13 @@ else
echo "${ECHO_T}no" >&6
fi
echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
if test "${ac_cv_lib_cposix_strerror+set}" = set; then
echo "$as_me:$LINENO: checking for library containing strerror" >&5
echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
if test "${ac_cv_search_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
ac_func_search_save_LIBS=$LIBS
ac_cv_search_strerror=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
......@@ -5990,24 +5989,80 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cposix_strerror=yes
ac_cv_search_strerror="none required"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_cposix_strerror=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
if test "$ac_cv_search_strerror" = no; then
for ac_lib in cposix; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char strerror ();
int
main ()
{
strerror ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_strerror="-l$ac_lib"
break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
if test $ac_cv_lib_cposix_strerror = yes; then
LIBS="$LIBS -lcposix"
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
done
fi
LIBS=$ac_func_search_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
echo "${ECHO_T}$ac_cv_search_strerror" >&6
if test "$ac_cv_search_strerror" != no; then
test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
fi
BUILD_FORTRAN=""
......@@ -7447,42 +7502,22 @@ esac
# All libs should be switched to use this new macro.
#
withval=no
# Check whether --with-hdf5 or --without-hdf5 was given.
if test "${with_hdf5+set}" = set; then
withval="$with_hdf5"
else
withval=${DEFAULT_HDF5_LIBLOC}
if test -n "$DEFAULT_HDF5_LIBLOC"; then
withval=$DEFAULT_HDF5_LIBLOC:$DEFAULT_HDF5_LIBDEP
fi
fi;
if test "x${withval}" != "xno"; then
#
# look up _LIBLOC, _LIBDEP variables
#
if test -n "${DEFAULT_HDF5_LIBLOC}"; then
withval=${DEFAULT_HDF5_LIBLOC}:${DEFAULT_HDF5_LIBDEP}
fi
fi
with_hdf5=$withval
HDF5_INCLUDE=""
HDF5_LIB=""
HDF5_TARGET=""
incfile=hdf5.h
libtags="hdf5"
incdirs="include inc ."
......@@ -7884,6 +7919,7 @@ echo "${ECHO_T}no" >&6
# Check for possible zlib dependence. If there is, we'll just add -lz
if test -n "$HDF5_LIB"; then
if test -n "`strings $HDF5_LIBFILE | grep -i inflateInit`"; then
......@@ -7912,42 +7948,22 @@ fi
# Handle the Silo library
#
withval=no
# Check whether --with-silo or --without-silo was given.
if test "${with_silo+set}" = set; then
withval="$with_silo"
else
withval=${DEFAULT_SILO_LIBLOC}
if test -n "$DEFAULT_SILO_LIBLOC"; then
withval=$DEFAULT_SILO_LIBLOC:$DEFAULT_SILO_LIBDEP
fi
fi;
if test "x${withval}" != "xno"; then
#
# look up _LIBLOC, _LIBDEP variables
#
if test -n "${DEFAULT_SILO_LIBLOC}"; then
withval=${DEFAULT_SILO_LIBLOC}:${DEFAULT_SILO_LIBDEP}
fi
fi
with_silo=$withval
SILO_INCLUDE=""
SILO_LIB=""
SILO_TARGET=""
incfile=silo.h
libtags="siloxx siloh5 silo"
incdirs="include inc ."
......@@ -8349,6 +8365,7 @@ echo "${ECHO_T}no" >&6
# Check for possible dependence on HDF5
if test -n "$SILO_LIB"; then
if test -n "`strings $SILO_LIBFILE | grep -i 'SILO built with HDF5'`"; then
......@@ -8470,42 +8487,22 @@ fi
# See of --with-pdb was specified. Use PDB lite otherwise.
#
withval=no
# Check whether --with-pdb or --without-pdb was given.
if test "${with_pdb+set}" = set; then
withval="$with_pdb"
else
withval=${DEFAULT_PDB_LIBLOC}
if test -n "$DEFAULT_PDB_LIBLOC"; then
withval=$DEFAULT_PDB_LIBLOC:$DEFAULT_PDB_LIBDEP
fi
fi;
if test "x${withval}" != "xno"; then
#
# look up _LIBLOC, _LIBDEP variables
#
if test -n "${DEFAULT_PDB_LIBLOC}"; then
withval=${DEFAULT_PDB_LIBLOC}:${DEFAULT_PDB_LIBDEP}
fi
fi
with_pdb=$withval
PDB_INCLUDE=""
PDB_LIB=""
PDB_TARGET=""
incfile=pdb.h
libtags="pdb"
incdirs="include inc ."
......@@ -8907,6 +8904,7 @@ echo "${ECHO_T}no" >&6
if test -z "$PDB_LIB"; then
echo "$as_me:$LINENO: checking for PDB lite (e.g Silo)" >&5
echo $ECHO_N "checking for PDB lite (e.g Silo)... $ECHO_C" >&6
......
......@@ -950,6 +950,9 @@ dnl
dnl Brad Whitlock, Mon May 4 13:14:20 PDT 2009
dnl Added VISIT_ to several defines for better namespace behavior
dnl
dnl Hank Childs, Tue May 5 01:03:49 CDT 2009
dnl Put -lGLU into the SLIVR libs.
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -1670,7 +1673,7 @@ if test "$UseSLIVR" = "yes"; then
AC_DEFINE(HAVE_LIBSLIVR, [1], [Define if you have the SLIVR library.])
BUILD_SLIVR="slivr"
SLIVR_INCLUDE="-I$""(TOPDIR)/include/teem -I$""(TOPDIR)/include/slivr"
SLIVR_LIBS="-lslivrV -lslivrG -lnrrd -lair -lbiff -lhest"
SLIVR_LIBS="-lslivrV -lslivrG -lnrrd -lair -lbiff -lhest -lGLU"
if test "$UNAME" = "Darwin"; then
TEEM_CMAKE_C_FLAGS="-D CMAKE_C_FLAGS:STRING=-fno-common"
SLIVR_CMAKE_SHARED_LINKER_FLAGS="-D CMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,-undefined,dynamic_lookup"
......
......@@ -20,7 +20,6 @@
$(SLIVR_LIBS)
$(GLEW_LIBS)
$(GL_LIBS)
-lGLU
</LIBS>
<Files components="S">
TransferFunctionWidget.C
......@@ -46,7 +45,6 @@
$(SLIVR_LIBS)
$(GLEW_LIBS)
$(GL_LIBS)
-lGLU
</LIBS>
<Files components="E">
VolumeFunctions.C
......@@ -68,7 +66,6 @@
$(SLIVR_LIBS)
$(GLEW_LIBS)
$(GL_LIBS)
-lGLU
</LIBS>
<Files components="W">
$(SLIVR_GUI_HDR)
......
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