diff options
author | Norbert Preining <norbert@preining.info> | 2023-03-11 03:01:57 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-03-11 03:01:57 +0000 |
commit | 6d29701d91e7deb368e3829e1ff11dcf483cd2fb (patch) | |
tree | 48b99cc0de5eddd0e49f8a6d0e5f515763b408f5 /dviware/dvisvgm/src | |
parent | f6cb3d263826846efe7b926e6ad2092198db0522 (diff) |
CTAN sync 202303110301
Diffstat (limited to 'dviware/dvisvgm/src')
-rw-r--r-- | dviware/dvisvgm/src/InputBuffer.cpp | 45 | ||||
-rw-r--r-- | dviware/dvisvgm/src/InputBuffer.hpp | 22 | ||||
-rw-r--r-- | dviware/dvisvgm/src/InputReader.cpp | 2 | ||||
-rw-r--r-- | dviware/dvisvgm/src/InputReader.hpp | 2 | ||||
-rw-r--r-- | dviware/dvisvgm/src/MD5HashFunction.hpp | 8 | ||||
-rw-r--r-- | dviware/dvisvgm/src/Makefile.am | 40 | ||||
-rw-r--r-- | dviware/dvisvgm/src/Makefile.in | 65 | ||||
-rw-r--r-- | dviware/dvisvgm/src/Process.cpp | 7 | ||||
-rw-r--r-- | dviware/dvisvgm/src/PsSpecialHandler.cpp | 16 | ||||
-rw-r--r-- | dviware/dvisvgm/src/fonts/Makefile.in | 2 | ||||
-rw-r--r-- | dviware/dvisvgm/src/optimizer/Makefile.in | 2 | ||||
-rw-r--r-- | dviware/dvisvgm/src/ttf/Makefile.in | 2 |
12 files changed, 105 insertions, 108 deletions
diff --git a/dviware/dvisvgm/src/InputBuffer.cpp b/dviware/dvisvgm/src/InputBuffer.cpp index 095b7e22cc..6c23f00063 100644 --- a/dviware/dvisvgm/src/InputBuffer.cpp +++ b/dviware/dvisvgm/src/InputBuffer.cpp @@ -26,60 +26,53 @@ using namespace std; StreamInputBuffer::StreamInputBuffer (istream &is, size_t bufsize) - : _is(is), _bufsize(bufsize), _buf1(new uint8_t[_bufsize]), _buf2(new uint8_t[_bufsize]), _bufptr(_buf1) + : _is(is), _buf1(bufsize), _buf2(bufsize) { _size1 = fillBuffer(_buf1); _size2 = fillBuffer(_buf2); } -StreamInputBuffer::~StreamInputBuffer () { - delete [] _buf1; - delete [] _buf2; -} - - +/** Returns the next character from the input buffer (or -1 if there's none). */ int StreamInputBuffer::get () { - if (pos() == _size1) { + if (_pos == _size1) { if (_size2 == 0) return -1; - swap(_buf1, _buf2); + swap(_buf1, _buf2); // O(1) swap of memory buffers _size1 = _size2; - _bufptr = _buf1; + _pos = 0; _size2 = fillBuffer(_buf2); } - uint8_t c = *_bufptr++; - return c; + return _buf1[_pos++]; } /** Returns the next character to be read without skipping it. * Same as peek(0). */ int StreamInputBuffer::peek () const { - if (pos() < _size1) - return *_bufptr; - return _size2 > 0 ? *_buf2 : -1; + if (_pos < _size1) + return _buf1[_pos]; + return _size2 > 0 ? _buf2[0] : -1; } /** Returns the n-th next character without skipping it. */ int StreamInputBuffer::peek (size_t n) const { - if (pos()+n < _size1) - return *(_bufptr+n); - if (pos()+n < _size1+_size2) - return *(_buf2 + pos()+n-_size1); + if (_pos+n < _size1) + return _buf1[_pos+n]; + if (_pos+n < _size1+_size2) + return _buf2[_pos+n-_size1]; return -1; } -/** Fills the buffer by reading a sequence of characters from the assigned - * input stream. - * @param[in] buf pointer to character buffer to be filled +/** Fills the buffer by reading a sequence of characters from the assigned input stream. + * @param[in] buf buffer to be filled * @return number of characters read */ -int StreamInputBuffer::fillBuffer (uint8_t *buf) { +size_t StreamInputBuffer::fillBuffer (vector<uint8_t> &buf) { if (_is && !_is.eof()) { - _is.read((char*)buf, _bufsize); - return _is.gcount(); + _is.read(reinterpret_cast<char*>(buf.data()), streamsize(buf.size())); + return _is.gcount(); } return 0; } @@ -133,5 +126,3 @@ int TextStreamInputBuffer::get () { _col++; return c; } - - diff --git a/dviware/dvisvgm/src/InputBuffer.hpp b/dviware/dvisvgm/src/InputBuffer.hpp index ea6ce17a70..cb429f9d0d 100644 --- a/dviware/dvisvgm/src/InputBuffer.hpp +++ b/dviware/dvisvgm/src/InputBuffer.hpp @@ -25,8 +25,9 @@ #include <cstdint> #include <cstring> #include <istream> -#include <string> #include <ostream> +#include <string> +#include <vector> struct InputBuffer { virtual ~InputBuffer () =default; @@ -42,26 +43,23 @@ class StreamInputBuffer : public InputBuffer { public: explicit StreamInputBuffer (std::istream &is, size_t bufsize=1024); StreamInputBuffer (const StreamInputBuffer &ib) =delete; - ~StreamInputBuffer () override; int get () override; int peek () const override; int peek (size_t n) const override; - bool eof () const override {return pos() == _size1 && _size2 == 0;} - void invalidate () override {_bufptr = _buf1+_size1; _size2 = 0;} + bool eof () const override {return _pos == _size1 && _size2 == 0;} + void invalidate () override {_pos = _size1; _size2 = 0;} void operator = (const StreamInputBuffer &ib) =delete; protected: - int fillBuffer (uint8_t *buf); - size_t pos () const {return _bufptr-_buf1;} + size_t fillBuffer (std::vector<uint8_t> &buf); private: std::istream &_is; - const size_t _bufsize; ///< maximal number of bytes each buffer can hold - uint8_t *_buf1; ///< pointer to first buffer - uint8_t *_buf2; ///< pointer to second buffer - size_t _size1; ///< number of bytes in buffer 1 - size_t _size2; ///< number of bytes in buffer 2 - uint8_t *_bufptr; ///< pointer to next byte to read + std::vector<uint8_t> _buf1; ///< first buffer + std::vector<uint8_t> _buf2; ///< second buffer + size_t _size1; ///< number of bytes in buffer 1 + size_t _size2; ///< number of bytes in buffer 2 + size_t _pos=0; ///< position of next character to be read from first buffer }; diff --git a/dviware/dvisvgm/src/InputReader.cpp b/dviware/dvisvgm/src/InputReader.cpp index 9c5cc504cd..bfca9d8606 100644 --- a/dviware/dvisvgm/src/InputReader.cpp +++ b/dviware/dvisvgm/src/InputReader.cpp @@ -394,7 +394,7 @@ int InputReader::parseAttributes (map<string,string> &attr, bool requireValues, else if (!requireValues) attr.emplace(std::move(key), ""); } - return attr.size(); + return int(attr.size()); } ////////////////////////////////////////// diff --git a/dviware/dvisvgm/src/InputReader.hpp b/dviware/dvisvgm/src/InputReader.hpp index fefd450bac..bd344fbf46 100644 --- a/dviware/dvisvgm/src/InputReader.hpp +++ b/dviware/dvisvgm/src/InputReader.hpp @@ -100,7 +100,7 @@ class StringMatcher { private: std::string _pattern; - std::vector<size_t> _borders; + std::vector<int> _borders; size_t _charsRead; }; diff --git a/dviware/dvisvgm/src/MD5HashFunction.hpp b/dviware/dvisvgm/src/MD5HashFunction.hpp index d5cfdf2bfa..7a379cc52a 100644 --- a/dviware/dvisvgm/src/MD5HashFunction.hpp +++ b/dviware/dvisvgm/src/MD5HashFunction.hpp @@ -21,13 +21,7 @@ #ifndef MD5HASHFUNCTION_HPP #define MD5HASHFUNCTION_HPP -#include <config.h> -#ifdef HAVE_OPENSSL_MD5_H -# include <openssl/md5.h> -#else -# include <md5.h> -#endif - +#include <md5.h> #include "HashFunction.hpp" class MD5HashFunction : public HashFunction { diff --git a/dviware/dvisvgm/src/Makefile.am b/dviware/dvisvgm/src/Makefile.am index 85ca88ddc4..1272a216f3 100644 --- a/dviware/dvisvgm/src/Makefile.am +++ b/dviware/dvisvgm/src/Makefile.am @@ -16,6 +16,7 @@ include ../libs/defs.am dvisvgm_LDADD = \ $(noinst_LTLIBRARIES) \ ../libs/clipper/libclipper.a \ + ../libs/md5/libmd5.a \ $(FREETYPE_LIBS) \ $(POTRACE_LIBS) \ $(XXHASH_LIBS) \ @@ -29,14 +30,13 @@ dvisvgm_LDADD += \ $(BROTLI_LIBS) endif -if USE_BUNDLED_MD5 -dvisvgm_LDADD += ../libs/md5/libmd5.a -else -dvisvgm_LDADD += $(LIBCRYPTO_LIBS) -endif - dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES) +if TEXLIVE_BUILD +dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) +dvisvgm_DEPENDENCIES += $(POTRACE_DEPEND) +endif + libdvisvgm_la_SOURCES = \ AGLTable.hpp \ BasicDVIReader.hpp BasicDVIReader.cpp \ @@ -170,11 +170,16 @@ endif EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp -AM_CFLAGS = -Wall \ +if !TEXLIVE_BUILD +WARNING_CFLAGS = -Wall +WARNING_CXXFLAGS = -Wall -Wnon-virtual-dtor +endif + +AM_CFLAGS = $(WARNING_CFLAGS) \ $(ZLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) -AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \ +AM_CXXFLAGS = $(WARNING_CXXFLAGS) \ -I$(dvisvgm_srcdir)/libs/clipper \ -I$(dvisvgm_srcdir)/libs/variant/include \ $(KPSE_CFLAGS) \ @@ -200,14 +205,9 @@ AM_CXXFLAGS += \ AM_LDFLAGS += $(TTFAUTOHINT_LIBS) endif -if USE_BUNDLED_MD5 AM_CXXFLAGS += -I$(dvisvgm_srcdir)/libs/md5 -else -AM_CXXFLAGS += $(LIBCRYPTO_CFLAGS) -endif - - +if !TEXLIVE_BUILD # the command-line parser class is generated from options.xml by opt2cpp $(srcdir)/CommandLine.hpp: options.xml rm -f $@ @@ -220,5 +220,17 @@ $(srcdir)/psdefs.cpp: psdefs.ps fi psdefs.ps: ; +endif !TEXLIVE_BUILD CLEANFILES = *.gcda *.gcno + +if TEXLIVE_BUILD +# Rebuild libkpathsea: +@KPATHSEA_RULE@ +# Rebuild libfreetype: +@FREETYPE2_RULE@ +# Rebuild libz: +@ZLIB_RULE@ +# Rebuild potrace: +@POTRACE_RULE@ +endif TEXLIVE_BUILD diff --git a/dviware/dvisvgm/src/Makefile.in b/dviware/dvisvgm/src/Makefile.in index 8ebc8641d3..411c96252d 100644 --- a/dviware/dvisvgm/src/Makefile.in +++ b/dviware/dvisvgm/src/Makefile.in @@ -99,14 +99,12 @@ bin_PROGRAMS = dvisvgm$(EXEEXT) @ENABLE_WOFF_TRUE@ $(WOFF2_LIBS) \ @ENABLE_WOFF_TRUE@ $(BROTLI_LIBS) -@USE_BUNDLED_MD5_TRUE@am__append_7 = ../libs/md5/libmd5.a -@USE_BUNDLED_MD5_FALSE@am__append_8 = $(LIBCRYPTO_LIBS) -@ENABLE_WOFF_TRUE@am__append_9 = ttf/libttf.la -@ENABLE_WOFF_TRUE@am__append_10 = $(TTFAUTOHINT_CFLAGS) \ +@TEXLIVE_BUILD_TRUE@am__append_7 = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \ +@TEXLIVE_BUILD_TRUE@ $(FREETYPE2_DEPEND) $(POTRACE_DEPEND) +@ENABLE_WOFF_TRUE@am__append_8 = ttf/libttf.la +@ENABLE_WOFF_TRUE@am__append_9 = $(TTFAUTOHINT_CFLAGS) \ @ENABLE_WOFF_TRUE@ $(BROTLI_CFLAGS) $(WOFF2_CFLAGS) -@ENABLE_WOFF_TRUE@am__append_11 = $(TTFAUTOHINT_LIBS) -@USE_BUNDLED_MD5_TRUE@am__append_12 = -I$(dvisvgm_srcdir)/libs/md5 -@USE_BUNDLED_MD5_FALSE@am__append_13 = $(LIBCRYPTO_CFLAGS) +@ENABLE_WOFF_TRUE@am__append_10 = $(TTFAUTOHINT_LIBS) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_ac_append_to_file.m4 \ @@ -132,7 +130,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) LTLIBRARIES = $(noinst_LTLIBRARIES) libdvisvgm_la_DEPENDENCIES = fonts/libbase14fonts.la \ - optimizer/liboptimizer.la $(am__append_9) + optimizer/liboptimizer.la $(am__append_8) am_libdvisvgm_la_OBJECTS = BasicDVIReader.lo Bezier.lo \ BgColorSpecialHandler.lo Bitmap.lo BoundingBox.lo \ Calculator.lo CharMapID.lo CLCommandLine.lo CMap.lo \ @@ -173,7 +171,6 @@ am__DEPENDENCIES_2 = $(am__append_4) am__DEPENDENCIES_3 = $(am__append_2) @ENABLE_WOFF_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) \ @ENABLE_WOFF_TRUE@ $(am__DEPENDENCIES_3) -@USE_BUNDLED_MD5_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -354,7 +351,7 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_LDFLAGS = $(KPSE_LIBS) $(CODE_COVERAGE_LDFLAGS) $(am__append_11) +AM_LDFLAGS = $(KPSE_LIBS) $(CODE_COVERAGE_LDFLAGS) $(am__append_10) AR = @AR@ ASCIIDOC = @ASCIIDOC@ AUTOCONF = @AUTOCONF@ @@ -410,8 +407,6 @@ KPSE_LIBS = @KPSE_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@ -LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -521,9 +516,9 @@ dvisvgm_SOURCES = \ @HAVE_XXHASH_FALSE@XXHASH_CFLAGS = -I$(dvisvgm_srcdir)/libs/xxHash @HAVE_XXHASH_FALSE@XXHASH_LIBS = ../libs/xxHash/libxxhash.a dvisvgm_LDADD = $(noinst_LTLIBRARIES) ../libs/clipper/libclipper.a \ - $(FREETYPE_LIBS) $(POTRACE_LIBS) $(XXHASH_LIBS) $(ZLIB_LIBS) \ - $(am__append_6) $(am__append_7) $(am__append_8) -dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES) + ../libs/md5/libmd5.a $(FREETYPE_LIBS) $(POTRACE_LIBS) \ + $(XXHASH_LIBS) $(ZLIB_LIBS) $(am__append_6) +dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES) $(am__append_7) libdvisvgm_la_SOURCES = \ AGLTable.hpp \ BasicDVIReader.hpp BasicDVIReader.cpp \ @@ -650,18 +645,19 @@ libdvisvgm_la_SOURCES = \ ZLibOutputStream.hpp libdvisvgm_la_LIBADD = fonts/libbase14fonts.la \ - optimizer/liboptimizer.la $(am__append_9) + optimizer/liboptimizer.la $(am__append_8) EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp -AM_CFLAGS = -Wall \ +@TEXLIVE_BUILD_FALSE@WARNING_CFLAGS = -Wall +@TEXLIVE_BUILD_FALSE@WARNING_CXXFLAGS = -Wall -Wnon-virtual-dtor +AM_CFLAGS = $(WARNING_CFLAGS) \ $(ZLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) -AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \ - -I$(dvisvgm_srcdir)/libs/clipper \ +AM_CXXFLAGS = $(WARNING_CXXFLAGS) -I$(dvisvgm_srcdir)/libs/clipper \ -I$(dvisvgm_srcdir)/libs/variant/include $(KPSE_CFLAGS) \ $(FREETYPE_CFLAGS) $(ZLIB_CFLAGS) $(CODE_COVERAGE_CFLAGS) \ - $(POTRACE_CFLAGS) $(XXHASH_CFLAGS) $(am__append_10) \ - $(am__append_12) $(am__append_13) + $(POTRACE_CFLAGS) $(XXHASH_CFLAGS) $(am__append_9) \ + -I$(dvisvgm_srcdir)/libs/md5 CLEANFILES = *.gcda *.gcno all: all-recursive @@ -1390,17 +1386,26 @@ uninstall-am: uninstall-binPROGRAMS # the command-line parser class is generated from options.xml by opt2cpp -$(srcdir)/CommandLine.hpp: options.xml - rm -f $@ - python $(srcdir)/opt2cpp.py $< >$@ +@TEXLIVE_BUILD_FALSE@$(srcdir)/CommandLine.hpp: options.xml +@TEXLIVE_BUILD_FALSE@ rm -f $@ +@TEXLIVE_BUILD_FALSE@ python $(srcdir)/opt2cpp.py $< >$@ # Create a C string definition containing the PostScript routines psdefs.ps needed by class PSInterpreter -$(srcdir)/psdefs.cpp: psdefs.ps - if test -f $<; then \ - ps2c PSInterpreter::PSDEFS $< >$@; \ - fi - -psdefs.ps: ; +@TEXLIVE_BUILD_FALSE@$(srcdir)/psdefs.cpp: psdefs.ps +@TEXLIVE_BUILD_FALSE@ if test -f $<; then \ +@TEXLIVE_BUILD_FALSE@ ps2c PSInterpreter::PSDEFS $< >$@; \ +@TEXLIVE_BUILD_FALSE@ fi + +@TEXLIVE_BUILD_FALSE@psdefs.ps: ; + +# Rebuild libkpathsea: +@TEXLIVE_BUILD_TRUE@@KPATHSEA_RULE@ +# Rebuild libfreetype: +@TEXLIVE_BUILD_TRUE@@FREETYPE2_RULE@ +# Rebuild libz: +@TEXLIVE_BUILD_TRUE@@ZLIB_RULE@ +# Rebuild potrace: +@TEXLIVE_BUILD_TRUE@@POTRACE_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/dviware/dvisvgm/src/Process.cpp b/dviware/dvisvgm/src/Process.cpp index 72465c0c73..c79f6e9526 100644 --- a/dviware/dvisvgm/src/Process.cpp +++ b/dviware/dvisvgm/src/Process.cpp @@ -118,10 +118,13 @@ bool Process::run (string *out, const SearchPattern &pattern, PipeFlags flags) { Subprocess subprocess; if (!subprocess.run(_cmd, _paramstr, flags)) return false; + if (out) + out->clear(); for (;;) { if (out) { - out->clear(); - subprocess.readFromPipe(*out, pattern); + string chunk; + subprocess.readFromPipe(chunk, pattern); + *out += chunk; } Subprocess::State state = subprocess.state(); if (state != Subprocess::State::RUNNING) diff --git a/dviware/dvisvgm/src/PsSpecialHandler.cpp b/dviware/dvisvgm/src/PsSpecialHandler.cpp index 7645adea02..5dfdfc0852 100644 --- a/dviware/dvisvgm/src/PsSpecialHandler.cpp +++ b/dviware/dvisvgm/src/PsSpecialHandler.cpp @@ -422,17 +422,17 @@ PsSpecialHandler::ImageNode PsSpecialHandler::createBitmapNode (const string &fn imgnode.element->addAttribute("y", 0); imgnode.element->addAttribute("width", bbox.width()); imgnode.element->addAttribute("height", bbox.height()); - - // Only reference the image with an absolute path if either an absolute path was given by the user - // or a given plain filename is not present in the current working directory but was found through - // the FileFinder, i.e. it's usually located somewhere in the texmf tree. - string href = path; - if (!FilePath::isAbsolute(fname) && (fname.find('/') != string::npos || FilePath(fname).exists())) - href = FilePath(path).relative(FilePath(_actions->getSVGFilePath(pageno))); if (EMBED_BITMAP_DATA) imgnode.element->addAttribute("@@xlink:href", "data:" + util::mimetype(fname) + ";base64," + fname); - else + else { + string href = path; + // Only reference the image with an absolute path if either an absolute path was given by the user + // or a given plain filename is not present in the current working directory but was found through + // the FileFinder, i.e. it's usually located somewhere in the texmf tree. + if (!FilePath::isAbsolute(fname) && (fname.find('/') != string::npos || FilePath(fname).exists())) + href = FilePath(path).relative(FilePath(_actions->getSVGFilePath(pageno))); imgnode.element->addAttribute("xlink:href", href); + } return imgnode; } diff --git a/dviware/dvisvgm/src/fonts/Makefile.in b/dviware/dvisvgm/src/fonts/Makefile.in index 4d46348ce4..8d96f5387c 100644 --- a/dviware/dvisvgm/src/fonts/Makefile.in +++ b/dviware/dvisvgm/src/fonts/Makefile.in @@ -277,8 +277,6 @@ KPSE_LIBS = @KPSE_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@ -LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/dviware/dvisvgm/src/optimizer/Makefile.in b/dviware/dvisvgm/src/optimizer/Makefile.in index 2f1424683a..cc979ed0bd 100644 --- a/dviware/dvisvgm/src/optimizer/Makefile.in +++ b/dviware/dvisvgm/src/optimizer/Makefile.in @@ -270,8 +270,6 @@ KPSE_LIBS = @KPSE_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@ -LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/dviware/dvisvgm/src/ttf/Makefile.in b/dviware/dvisvgm/src/ttf/Makefile.in index b3e1721d82..33746f9d1f 100644 --- a/dviware/dvisvgm/src/ttf/Makefile.in +++ b/dviware/dvisvgm/src/ttf/Makefile.in @@ -271,8 +271,6 @@ KPSE_LIBS = @KPSE_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@ -LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ |