* apt-pkg/deb/dpkgpm.cc:

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

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 87f4336e203ff1bfcb230b6a2e1a914b4f137358..4e47692f50f3e5aabee681c026078d24298e3e00 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -5,7 +5,7 @@ PACKAGE = @PACKAGE@
 
 # C++ compiler options
 CC = @CC@
 
 # C++ compiler options
 CC = @CC@

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

 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@


@@ -28,19 +28,22 @@ INLINEDEPFLAG = -MD
 DEBIANDOC_HTML = @DEBIANDOC_HTML@
 DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 DEBIANDOC_HTML = @DEBIANDOC_HTML@
 DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 

+DOXYGEN = @DOXYGEN@
+

 # SGML for the man pages
 # SGML for the man pages

-NSGMLS = @NSGMLS@
-SGMLSPL = @SGMLSPL@
-DOCBOOK2MAN := $(wildcard /usr/lib/perl5/sgmlspl-specs/docbook2man-spec.pl)
+DOCBOOK2MAN := @DOCBOOK2MAN@
+
+# XML for the man pages
+XMLTO := @XMLTO@
+
+# XML for the man pages
+XMLTO := @XMLTO@

 
 # Gettext settings
 GMSGFMT = @GMSGFMT@
 XGETTEXT = @XGETTEXT@
 MSGCOMM:=$(dir $(XGETTEXT))/msgcomm
 MSGMERGE:=$(dir $(XGETTEXT))/msgmerge
 
 # Gettext settings
 GMSGFMT = @GMSGFMT@
 XGETTEXT = @XGETTEXT@
 MSGCOMM:=$(dir $(XGETTEXT))/msgcomm
 MSGMERGE:=$(dir $(XGETTEXT))/msgmerge

-CATALOGS = @CATALOGS@
-USE_NLS = @USE_NLS@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@

 BASH = @BASH@
 
 # Various library checks
 BASH = @BASH@
 
 # Various library checks


@@ -50,7 +53,8 @@ PYTHONVER = @PYTHONVER@
 PYTHONPREFIX = @PYTHONPREFIX@
 PYTHONEXECPREFIX = @PYTHONEXECPREFIX@
 PYTHONINCLUDE = @PYTHONINCLUDE@
 PYTHONPREFIX = @PYTHONPREFIX@
 PYTHONEXECPREFIX = @PYTHONEXECPREFIX@
 PYTHONINCLUDE = @PYTHONINCLUDE@

-DB2LIB = @DB2LIB@
+BDBLIB = @BDBLIB@
+INTLLIBS = @INTLLIBS@

 
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@
 
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@


@@ -60,7 +64,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
 
 # Shared library things
 HOST_OS = @host_os@

-ifneq ($(words $(filter linux-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
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else