Updated French translation from Christian Perrier <bubu...

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

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 9ec0f4b412bd1649e0f2ba92d37297c7a8637d02..1b0e0b268c1bfc78506429d18faf47ce305b0fdc 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -1,6 +1,8 @@
 # This file contains everything that autoconf guessed for your system.
 # if you want you can edit it, just don't re-run configure.
 
+PACKAGE = @PACKAGE@
+
 # C++ compiler options
 CC = @CC@
 CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT
@@ -19,6 +21,7 @@ AR:=@AR@
 RANLIB:=@RANLIB@
 
 # Dep generation - this only works for gnu stuff
+GCC3DEP = @GCC3DEP@
 INLINEDEPFLAG = -MD
 
 # Debian doc stuff
@@ -26,9 +29,17 @@ DEBIANDOC_HTML = @DEBIANDOC_HTML@
 DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 # 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@
+
+# Gettext settings
+GMSGFMT = @GMSGFMT@
+XGETTEXT = @XGETTEXT@
+MSGCOMM:=$(dir $(XGETTEXT))/msgcomm
+MSGMERGE:=$(dir $(XGETTEXT))/msgmerge
+BASH = @BASH@
 
 # Various library checks
 PTHREADLIB = @PTHREADLIB@
@@ -38,15 +49,17 @@ PYTHONPREFIX = @PYTHONPREFIX@
 PYTHONEXECPREFIX = @PYTHONEXECPREFIX@
 PYTHONINCLUDE = @PYTHONINCLUDE@
 DB2LIB = @DB2LIB@
+INTLLIBS = @INTLLIBS@
 
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@
 HAVE_STATVFS = @HAVE_STATVFS@
+HAVE_TIMEGM = @HAVE_TIMEGM@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
-ifneq ($(words $(filter linux-gnu gnu%,$(HOST_OS))),0)
+ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else