Permalink
Browse files

remove picttoppm

also, don't read cfgcache.pm in configure - was a no-op due to missing
package name
  • Loading branch information...
Dan Gildea
Dan Gildea committed May 23, 2018
1 parent fc0a418 commit 251d51b7398d30ee48a4038ee180ccd1a2e8d08e
Showing with 2 additions and 34 deletions.
  1. +0 −16 config/config.pl
  2. +2 −13 configure
  3. +0 −1 l2hconf.pin
  4. +0 −3 prefs.pm
  5. +0 −1 texlive.pm
@@ -1710,22 +1710,6 @@ package main;
}
}

# --------------------------------------------------------------------------
# PICTTOPPM
# --------------------------------------------------------------------------
# used in graphics-support.perl for handling \includegraphics options

$newcfg{'PICTTOPPM'} = '';

if(1) {
my $picttoppm = &find_prog(&get_name('PICTTOPPM',1));
if($picttoppm) {
$newcfg{'PICTTOPPM'} = $picttoppm;
} else {
&warn_no_image_type('pict');
}
}

# --------------------------------------------------------------------------
# ANYTOPNM
# --------------------------------------------------------------------------
@@ -111,8 +111,6 @@ ac_help="$ac_help
--with-pnmtopng=PATH path/name of the pnmtopng executable"
ac_help="$ac_help
--with-tifftopnm=PATH path/name of the tifftopnm executable"
ac_help="$ac_help
--with-picttoppm=PATH path/name of the picttoppm executable"
ac_help="$ac_help
--with-anytopnm=PATH path/name of the anytopnm executable"
ac_help="$ac_help
@@ -1034,14 +1032,6 @@ else
with_tifftopnm=${TIFFTOPNM:-}
fi

# Check whether --with-picttoppm or --without-picttoppm was given.
if test "${with_picttoppm+set}" = set; then
withval="$with_picttoppm"
:
else
with_picttoppm=${PICTTOPPM:-}
fi

# Check whether --with-anytopnm or --without-anytopnm was given.
if test "${with_anytopnm+set}" = set; then
withval="$with_anytopnm"
@@ -1264,7 +1254,6 @@ $PERL $srcdir/config/config.pl \
JPEGTOPNM=$with_jpegtopnm \
PNGTOPNM=$with_pngtopnm \
TIFFTOPNM=$with_tifftopnm \
PICTTOPPM=$with_picttoppm \
ANYTOPNM=$with_anytopnm \
BMPTOPPM=$with_bmptoppm \
PCXTOPNM=$with_pcxtopnm \
@@ -1279,8 +1268,8 @@ if test "$?" != "0"; then
exit 1
fi

# this is used to get the values from the config file
eval `perl -w -e 'use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'`
# this was used to get the values from the config file
# eval `perl -w -e 'require "./cfgcache.pm"; foreach(keys %cfgcache::cfg) { print qq($_='"'"'$cfgcache::cfg{$_}'"'"'\n);}'`



@@ -854,7 +854,6 @@ $TIFFTOPNM = '@TIFFTOPNM@';
$ANYTOPNM = '@ANYTOPNM@';
$BMPTOPPM = '@BMPTOPPM@';
$PCXTOPPM = '@PCXTOPPM@';
$PICTTOPPM = '@PICTTOPPM@';
$SGITOPNM = '@SGITOPNM@';
$XBMTOPBM = '@XBMTOPBM@';
$XWDTOPNM = '@XWDTOPNM@';
@@ -342,9 +342,6 @@ $prefs{'PNGTOPNM'} = 'pngtopnm';
# the tifftopnm executable for converting TIFF images to portable form
$prefs{'TIFFTOPNM'} = 'tifftopnm';

# the picttoppm executable for converting PICT images to portable form
$prefs{'PICTTOPPM'} = 'picttoppm';

# the anytopnm executable for converting arbitrary images to portable form
$prefs{'ANYTOPNM'} = 'anytopnm';

@@ -56,7 +56,6 @@ $cfg{'PERL'} = q|perl|;
$cfg{'PERLFOOTER'} = '__END__';
$cfg{'PERLHEADER'} = q" -*- perl -*- -w\n";
$cfg{'PERLSCRIPTDIR'} = q'/usr/bin'; # not used with TeXlive
$cfg{'PICTTOPPM'} = q|picttoppm|;
$cfg{'PK_GENERATION'} = q|0|;
$cfg{'PNMBLACK'} = q||;
$cfg{'PNMCAT'} = q|pnmcat|;

0 comments on commit 251d51b

Please sign in to comment.