make http size check work

[apt.git] / buildlib / environment.mak.in

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 2d28e1c6749fe86cb7a1dd87c10d8feb0a8f759d..b0a8d9d357c8b3b1d1ae89274b5bbc65641cce7a 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -2,15 +2,19 @@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@

+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_MAIL = @PACKAGE_MAIL@

 
 # C++ compiler options
 CC = @CC@
 
 # C++ compiler options
 CC = @CC@

-CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
+CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2

 CXX = @CXX@
 CXX = @CXX@

-CXXFLAGS+= @CXXFLAGS@
+CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra
+CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations
+CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn
+# a bit too pedantic to be run by default
+#CXXFLAGS+= -Wpedantic -Wno-long-long -Wno-vla -Wno-variadic-macros

 NUM_PROCS = @NUM_PROCS@
 NUM_PROCS = @NUM_PROCS@

-GLIBC_VER = @GLIBC_VER@
-LIBSTDCPP_VER = @LIBSTDCPP_VER@

 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC


@@ -24,20 +28,19 @@ RANLIB:=@RANLIB@
 GCC3DEP = @GCC3DEP@
 INLINEDEPFLAG = -MD
 
 GCC3DEP = @GCC3DEP@
 INLINEDEPFLAG = -MD
 

-# Debian doc stuff
-DEBIANDOC_HTML = @DEBIANDOC_HTML@
-DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
-

 DOXYGEN = @DOXYGEN@
 DOXYGEN = @DOXYGEN@

+W3M = @W3M@

 
 

-# SGML for the man pages
-DOCBOOK2MAN := @DOCBOOK2MAN@
+# xsltproc for the man pages and documentation
+XSLTPROC := @XSLTPROC@

 
 

-# XML for the man pages
-XMLTO := @XMLTO@
+# DocBook XML
+DOCBOOK = $(XSLTPROC) --nonet --novalid --xinclude
+DOCBOOK2TEXT = $(W3M) -o display_charset=UTF-8 -no-graph -T text/html \
+       -cols 78 -dump

 
 

-# XML for the man pages
-XMLTO := @XMLTO@
+# po4a for the man pages
+PO4A := @PO4A@

 
 # Gettext settings
 GMSGFMT = @GMSGFMT@
 
 # Gettext settings
 GMSGFMT = @GMSGFMT@


@@ -57,18 +60,18 @@ BDBLIB = @BDBLIB@
 INTLLIBS = @INTLLIBS@
 
 # Shim Headerfile control
 INTLLIBS = @INTLLIBS@
 
 # Shim Headerfile control

-HAVE_C9X = @HAVE_C9X@

 HAVE_STATVFS = @HAVE_STATVFS@
 HAVE_STATVFS = @HAVE_STATVFS@

-HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_ZLIB = @HAVE_ZLIB@
+HAVE_BZ2 = @HAVE_BZ2@
+HAVE_LZMA = @HAVE_LZMA@

 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@

-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)

    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else
    # Do not know how to create shared libraries here.
    ONLYSTATICLIBS = yes
 endif
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else
    # Do not know how to create shared libraries here.
    ONLYSTATICLIBS = yes
 endif

-