octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

more 32/64-bit errors

Browse Source 
git-svn-id: svn+q:///qpdf/trunk@618 71b93d88-0707-0410-a8cf-f5a4172ac649
This commit is contained in:
Jay Berkenbilt 2008-05-05 14:29:12 +00:00
parent 62bff4861f
commit 0ea47593f9
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -92,12 +92,13 @@ $(foreach B,$(BUILD_ITEMS),$(eval \
distclean: clean distclean: clean
$(RM) -r autoconf.mk autom4te.cache config.log config.status libtool $(RM) -r autoconf.mk autom4te.cache config.log config.status libtool
$(RM) libqpdf/qpdf/qpdf-config.h
$(RM) manual/html.xsl $(RM) manual/html.xsl
$(RM) manual/print.xsl $(RM) manual/print.xsl
$(RM) doc/*.1 $(RM) doc/*.1
maintainer-clean: distclean maintainer-clean: distclean
$(RM) configure doc/qpdf-manual.* $(RM) configure doc/qpdf-manual.* libqpdf/qpdf/qpdf-config.h.in
.PHONY: $(TEST_TARGETS) .PHONY: $(TEST_TARGETS)
$(foreach B,$(TEST_ITEMS),$(eval \ $(foreach B,$(TEST_ITEMS),$(eval \
@ -140,5 +141,10 @@ QTEST=$(abspath qtest/bin/qtest-driver)
$(TEST_TARGETS): $(TEST_TARGETS):
@echo running qtest-driver for $(subst check_,,$@) @echo running qtest-driver for $(subst check_,,$@)
@(cd $(subst check_,,$@)/$(OUTPUT_DIR); \ @(cd $(subst check_,,$@)/$(OUTPUT_DIR); \
TC_SRCS="$(foreach T,$(TC_SRCS_$(subst check_,,$@)),../../$(T))" \ if TC_SRCS="$(foreach T,$(TC_SRCS_$(subst check_,,$@)),../../$(T))" \
$(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..) $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \
true; \
else \
cat -v qtest.log; \
false; \
fi)

12
README.maintainer
View File

@ -24,6 +24,7 @@ Release Reminders
make_release does the following. make_release does the following.
autoconf autoconf
autoheader
./configure --enable-doc-maintenance ./configure --enable-doc-maintenance
make build_manual make build_manual
make distclean make distclean
@ -34,12 +35,11 @@ Release Reminders
General Build Stuff General Build Stuff
=================== ===================
QPDF supports autoconf and libtool but does not use automake. In QPDF supports autoconf and libtool but does not use automake. The
addition, there is no header file generated by autoconf. The only only files distributed with the qpdf source distribution that are not
file distributed with the qpdf source distribution that is not a controlled are "configure", "libqpdf/qpdf/qpdf-config.h.in", and some
controlled file is "configure", and it is generated by just running documentation. See above for the steps required to prepare a source
"autoconf". There is no need to run autoreconf, automake, autoheader, distribution.
aclocal, or any other autotools programs beyond autoconf.
A small handful of additional files have been taken from autotools A small handful of additional files have been taken from autotools
programs. These should probably be updated from time to time. programs. These should probably be updated from time to time.

5
configure.ac
View File

@ -7,6 +7,7 @@ AC_INIT(qpdf,2.0)
dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer. dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer.
AC_CONFIG_FILES([autoconf.mk]) AC_CONFIG_FILES([autoconf.mk])
AC_CONFIG_FILES([manual/html.xsl manual/print.xsl]) AC_CONFIG_FILES([manual/html.xsl manual/print.xsl])
AC_CONFIG_HEADERS([libqpdf/qpdf/qpdf-config.h])
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
@ -18,6 +19,10 @@ AC_SEARCH_LIBS(deflate,z zlib,,[MISSING_ZLIB=1; MISSING_ANY=1])
AC_CHECK_HEADER(pcre.h,,[MISSING_PCRE_H=1; MISSING_ANY=1]) AC_CHECK_HEADER(pcre.h,,[MISSING_PCRE_H=1; MISSING_ANY=1])
AC_SEARCH_LIBS(pcre_compile,pcre,,[MISSING_PCRE=1; MISSING_ANY=1]) AC_SEARCH_LIBS(pcre_compile,pcre,,[MISSING_PCRE=1; MISSING_ANY=1])
AC_TYPE_INT16_T
AC_TYPE_INT32_T
AC_TYPE_INT64_T
AC_MSG_CHECKING(for gnu make >= 3.81) AC_MSG_CHECKING(for gnu make >= 3.81)
make_okay=0 make_okay=0
if make --version >/dev/null 2>&1; then if make --version >/dev/null 2>&1; then

5
libqpdf/qpdf/MD5.hh
View File

@ -4,6 +4,7 @@
#include <string> #include <string>
#include <qpdf/QEXC.hh> #include <qpdf/QEXC.hh>
#include <qpdf/qpdf-config.h>
class MD5 class MD5
{ {
@ -49,10 +50,10 @@ class MD5
typedef void *POINTER; typedef void *POINTER;
// UINT2 defines a two byte word // UINT2 defines a two byte word
typedef unsigned short int UINT2; typedef uint16_t UINT2;
// UINT4 defines a four byte word // UINT4 defines a four byte word
typedef unsigned long int UINT4; typedef uint32_t UINT4;
void init(); void init();
void update(unsigned char *, unsigned int); void update(unsigned char *, unsigned int);

1
make_dist
View File

@ -110,6 +110,7 @@ if ($version_error)
} }
run("autoconf"); run("autoconf");
run("autoheader");
run("./configure --enable-doc-maintenance"); run("./configure --enable-doc-maintenance");
run("make build_manual"); run("make build_manual");
run("make distclean"); run("make distclean");