Commit ea0ec949 authored by hrchilds's avatar hrchilds

Update from December 2, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@578 18c085ea-50e0-402c-830e-de6fd14e8384
parent 44288529
......@@ -115,6 +115,9 @@
# on the components directory. I did this because of prebinding on the
# Mac.
#
# Mark C. Miller, Fri Dec 2 00:11:45 PST 2005
# Added third_party_builtin directory
#
##############################################################################
@SET_MAKE@
......@@ -125,7 +128,8 @@ DISTRIB=configure configure.in VERSION
SUBDIRS=include lib bin common @VTKQT@ visit_vtk components engine \
launcher @METADATA_SERVER@ winutil @VIEWER@ @GUI@ @VISITPY@ \
@JAVA_TARGET@ plots operators databases @HELP@ tools
@JAVA_TARGET@ plots operators databases @HELP@ tools \
third_party_builtin/
#
# Make sure that the installation directories exist
......
......@@ -68,6 +68,9 @@
# Jeremy Meredith, Fri Oct 28 10:14:12 PDT 2005
# I added cqscore.
#
# Mark C. Miller, Thu Dec 1 19:31:07 PST 2005
# Added third_party_builtin top level dir
#
#
# The loop is executed once for each symbol on the execute line. This means
......@@ -121,4 +124,5 @@ PATH="$PATH:./clearcase_bin"
./clearcase_bin/mkman --quiet --recursive --simple ./clearcase_bin
./clearcase_bin/mkman --quiet --recursive --simple ./config-site
./clearcase_bin/mkman --quiet --recursive --simple ./cqscore
./clearcase_bin/mkman --quiet --recursive --simple ./third_party_builtin
) | sort | uniq
This diff is collapsed.
......@@ -583,6 +583,11 @@ dnl
dnl Kathleen Bonnell, Wed Nov 16 08:51:43 PST 2005
dnl Added -lXt to X_LIBS.
dnl
dnl Mark C. Miller, Thu Dec 1 19:31:07 PST 2005
dnl Changed support for bzip2 to a third_party_builtin library
dnl This means it is part of the distribution and gets built whenever
dnl VisIt gets built. It can be disabled with --disable-bzip2
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -1235,6 +1240,20 @@ case $withval in
esac
AC_SUBST(DB_OPTIONAL_DIRS)
dnl
dnl Disable building bzip2. Only necessary if bzip2 won't buid somewhere
dnl
AC_ARG_ENABLE(bzip2,
[ --disable-bzip2 do not build or use bzip2 library -- disables compression],
Usebzip2="$enable_bzip2", Usebzip2=yes)
BUILD_BZIP2=""
if test "$Usebzip2" = "yes"; then
BUILD_BZIP2="bzip2"
AC_DEFINE(HAVE_LIBBZ2)
LIBS="-lbz2 $LIBS"
fi
AC_SUBST(BUILD_BZIP2)
dnl
dnl Make note if no CXXFLAGS have STILL yet been specified; this is the
dnl same check as for emptycxxflags above, except it is possible that a
......@@ -1414,9 +1433,6 @@ AC_TRY_COMPILE([#include <sys/types.h>
# are needed. The libraries are added to the beginning of `LIBS'.
#
AC_CHECK_LIB(m, main, LIBS="-lm $LIBS")
AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, LIBS="-lbz2 $LIBS"
AC_DEFINE(HAVE_LIBBZ2)
)
dnl Is zlib present?
dnl
......@@ -3247,6 +3263,8 @@ DATABASE_FILES="databases/Makefile"
DATA_FILES="data/Makefile"
SIMULATION_PROTOTYPE_FILES="sim/Makefile"
CQSCORE_FILES="cqscore/Makefile"
THIRD_PARTY_BUILTIN_FILES="third_party_builtin/Makefile
third_party_builtin/bzip2/Makefile"
if test "$enable_scripting" = "yes"; then
VISITPY_FILES="visitpy/Makefile"
......@@ -3285,6 +3303,7 @@ AC_OUTPUT($STANDARD_FILES
$VISITPY_FILES
$SIMULATION_PROTOTYPE_FILES
$CQSCORE_FILES
$THIRD_PARTY_BUILTIN_FILES
$JAVA_FILES,
echo timestamp > include/stamp-h)
......
# Copyright 2000 - 2004
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#
# DISCLAIMER
#
# This software was prepared as an account of work sponsored by an agency of
# the United States Government. Neither the United States Government nor the
# University of California nor any of their employees, makes any warranty,
# express or implied, or assumes any liability or responsiblity for the
# accuracy, completeness, or usefullness of any information, apparatus,
# product, or process disclosed, or represents that its use would not infringe
# privately owned rights. Reference herein to any specific commercial
# products, process, or service by trade name, trademark, manufacturer, or
# otherwise, does not necessarily constitute or imply its endorsement,
# recommendation, or favoring by the United States Government or the
# University of California. The views and opinions of authors expressed herein
# do not necessarily state or reflect those of the United States Government or
# the University of California, and shall not be used for advertising or
# product endorsement purposes.
#
# Modifications:
#
##############################################################################
@SET_MAKE@
@VARIABLES@
@DIRTARGETS@
SUBDIRS=@BUILD_BZIP2@
message:
@echo
@echo "****************************************************************************"
@echo "****************************************************************************"
@echo "***"
@echo "*** Building VisIt's Third Party Builtin Libraries"
@echo "***"
@echo "****************************************************************************"
@echo "****************************************************************************"
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
CPPFLAGS=-I. -I../../include @CPPFLAGS@ @VTK_INCLUDES@ @SILO_INCLUDE@
LIBS=
##
## We distribute sources for bzip2 with VisIt via the tar file
##
NOT_DISTRIB=blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c \
bzlib.c bzlib.h bzlib_private.h words* LICENSE
DISTRIB=bzip2-1.0.3.v.tar.gz
##
## Files...
##
SRC=blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c
HDR=bzlib.h bzlib_private.h
OBJ=$(SRC:.c=.o)
LIB=libbz2
##
## Standard targets...
##
all: message $(LIBSHARED)
clean:
$(RM) $(OBJ) $(SRC) $(HDR) $(LIBSHARED) LICENSE words* ../../include/bzlib.h
LICENSE:
gunzip < bzip2-1.0.3.v.tar.gz | tar xvf -
touch LICENSE
cp bzlib.h ../../include/visit/.
blocksort.c: LICENSE
huffman.c: LICENSE
crctable.c: LICENSE
randtable.c: LICENSE
compress.c: LICENSE
decompress.c: LICENSE
bzlib.c: LICENSE
##
## Other targets
##
message:
@echo
@echo "****************************************************************************"
@echo "*** Building Bzip2 Library ($(LIB))"
@echo "****************************************************************************"
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
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