1
0
Fork 0

Added zlib library support.

This commit is contained in:
curt 1998-04-18 03:57:53 +00:00
parent 7bc397dd65
commit e9faab034f

View file

@ -43,11 +43,7 @@ $do_fixobj = 1;
# set the FG_ROOT environment variable if it hasn't already been set. # set the FG_ROOT environment variable if it hasn't already been set.
if ( $ENV{FG_ROOT} eq "" ) { if ( $ENV{FG_ROOT} eq "" ) {
# look for a file called fgtop as a place marker # look for a file called fgtop as a place marker
if ( -e "fgtop" ) { die "You must remember to set the FG_ROOT environment variable!\n";
$ENV{FG_ROOT} = ".";
} elsif ( -e "../fgtop" ) {
$ENV{FG_ROOT} = "..";
}
} }
@ -124,11 +120,7 @@ sub file_root {
# irregularly fitted vertices # irregularly fitted vertices
sub dem2node { sub dem2node {
if ( $dem_file =~ m/.gz$/ ) { $command = "Dem2node/dem2node $ENV{FG_ROOT} $dem_file $error";
$command = "gzip -dc $dem_file | Dem2node/dem2node $ENV{FG_ROOT} - $error";
} else {
$command = "Dem2node/dem2node $ENV{FG_ROOT} $dem_file $error";
}
$command = fix_command($command); $command = fix_command($command);
print "Running '$command'\n"; print "Running '$command'\n";
@ -179,11 +171,7 @@ sub triangle_1 {
# fixed file.1.node # fixed file.1.node
sub fixnode { sub fixnode {
if ( $dem_file =~ m/.gz$/ ) { $command = "FixNode/fixnode $dem_file $subdir";
$command = "gzip -dc $dem_file | FixNode/fixnode - $subdir";
} else {
$command = "FixNode/fixnode $dem_file $subdir";
}
$command = fix_command($command); $command = fix_command($command);
print "Running '$command'\n"; print "Running '$command'\n";
open(OUT, "$command |"); open(OUT, "$command |");
@ -387,6 +375,9 @@ sub fixobj {
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.16 1998/04/18 03:57:53 curt
# Added zlib library support.
#
# Revision 1.15 1998/04/08 23:24:07 curt # Revision 1.15 1998/04/08 23:24:07 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #