Commit 0ea47593f90d4db0bae7b3a16c2370582f2fbe0e
1 parent
62bff486
more 32/64-bit errors
git-svn-id: svn+q:///qpdf/trunk@618 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
5 changed files
with
24 additions
and
11 deletions
Makefile
| ... | ... | @@ -92,12 +92,13 @@ $(foreach B,$(BUILD_ITEMS),$(eval \ |
| 92 | 92 | |
| 93 | 93 | distclean: clean |
| 94 | 94 | $(RM) -r autoconf.mk autom4te.cache config.log config.status libtool |
| 95 | + $(RM) libqpdf/qpdf/qpdf-config.h | |
| 95 | 96 | $(RM) manual/html.xsl |
| 96 | 97 | $(RM) manual/print.xsl |
| 97 | 98 | $(RM) doc/*.1 |
| 98 | 99 | |
| 99 | 100 | maintainer-clean: distclean |
| 100 | - $(RM) configure doc/qpdf-manual.* | |
| 101 | + $(RM) configure doc/qpdf-manual.* libqpdf/qpdf/qpdf-config.h.in | |
| 101 | 102 | |
| 102 | 103 | .PHONY: $(TEST_TARGETS) |
| 103 | 104 | $(foreach B,$(TEST_ITEMS),$(eval \ |
| ... | ... | @@ -140,5 +141,10 @@ QTEST=$(abspath qtest/bin/qtest-driver) |
| 140 | 141 | $(TEST_TARGETS): |
| 141 | 142 | @echo running qtest-driver for $(subst check_,,$@) |
| 142 | 143 | @(cd $(subst check_,,$@)/$(OUTPUT_DIR); \ |
| 143 | - TC_SRCS="$(foreach T,$(TC_SRCS_$(subst check_,,$@)),../../$(T))" \ | |
| 144 | - $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..) | |
| 144 | + if TC_SRCS="$(foreach T,$(TC_SRCS_$(subst check_,,$@)),../../$(T))" \ | |
| 145 | + $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \ | |
| 146 | + true; \ | |
| 147 | + else \ | |
| 148 | + cat -v qtest.log; \ | |
| 149 | + false; \ | |
| 150 | + fi) | ... | ... |
README.maintainer
| ... | ... | @@ -24,6 +24,7 @@ Release Reminders |
| 24 | 24 | make_release does the following. |
| 25 | 25 | |
| 26 | 26 | autoconf |
| 27 | + autoheader | |
| 27 | 28 | ./configure --enable-doc-maintenance |
| 28 | 29 | make build_manual |
| 29 | 30 | make distclean |
| ... | ... | @@ -34,12 +35,11 @@ Release Reminders |
| 34 | 35 | General Build Stuff |
| 35 | 36 | =================== |
| 36 | 37 | |
| 37 | -QPDF supports autoconf and libtool but does not use automake. In | |
| 38 | -addition, there is no header file generated by autoconf. The only | |
| 39 | -file distributed with the qpdf source distribution that is not a | |
| 40 | -controlled file is "configure", and it is generated by just running | |
| 41 | -"autoconf". There is no need to run autoreconf, automake, autoheader, | |
| 42 | -aclocal, or any other autotools programs beyond autoconf. | |
| 38 | +QPDF supports autoconf and libtool but does not use automake. The | |
| 39 | +only files distributed with the qpdf source distribution that are not | |
| 40 | +controlled are "configure", "libqpdf/qpdf/qpdf-config.h.in", and some | |
| 41 | +documentation. See above for the steps required to prepare a source | |
| 42 | +distribution. | |
| 43 | 43 | |
| 44 | 44 | A small handful of additional files have been taken from autotools |
| 45 | 45 | programs. These should probably be updated from time to time. | ... | ... |
configure.ac
| ... | ... | @@ -7,6 +7,7 @@ AC_INIT(qpdf,2.0) |
| 7 | 7 | dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer. |
| 8 | 8 | AC_CONFIG_FILES([autoconf.mk]) |
| 9 | 9 | AC_CONFIG_FILES([manual/html.xsl manual/print.xsl]) |
| 10 | +AC_CONFIG_HEADERS([libqpdf/qpdf/qpdf-config.h]) | |
| 10 | 11 | |
| 11 | 12 | AC_PROG_CC |
| 12 | 13 | AC_PROG_CXX |
| ... | ... | @@ -18,6 +19,10 @@ AC_SEARCH_LIBS(deflate,z zlib,,[MISSING_ZLIB=1; MISSING_ANY=1]) |
| 18 | 19 | AC_CHECK_HEADER(pcre.h,,[MISSING_PCRE_H=1; MISSING_ANY=1]) |
| 19 | 20 | AC_SEARCH_LIBS(pcre_compile,pcre,,[MISSING_PCRE=1; MISSING_ANY=1]) |
| 20 | 21 | |
| 22 | +AC_TYPE_INT16_T | |
| 23 | +AC_TYPE_INT32_T | |
| 24 | +AC_TYPE_INT64_T | |
| 25 | + | |
| 21 | 26 | AC_MSG_CHECKING(for gnu make >= 3.81) |
| 22 | 27 | make_okay=0 |
| 23 | 28 | if make --version >/dev/null 2>&1; then | ... | ... |
libqpdf/qpdf/MD5.hh
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | |
| 5 | 5 | #include <string> |
| 6 | 6 | #include <qpdf/QEXC.hh> |
| 7 | +#include <qpdf/qpdf-config.h> | |
| 7 | 8 | |
| 8 | 9 | class MD5 |
| 9 | 10 | { |
| ... | ... | @@ -49,10 +50,10 @@ class MD5 |
| 49 | 50 | typedef void *POINTER; |
| 50 | 51 | |
| 51 | 52 | // UINT2 defines a two byte word |
| 52 | - typedef unsigned short int UINT2; | |
| 53 | + typedef uint16_t UINT2; | |
| 53 | 54 | |
| 54 | 55 | // UINT4 defines a four byte word |
| 55 | - typedef unsigned long int UINT4; | |
| 56 | + typedef uint32_t UINT4; | |
| 56 | 57 | |
| 57 | 58 | void init(); |
| 58 | 59 | void update(unsigned char *, unsigned int); | ... | ... |