More usr doc fixes

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

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index cbc4ca0bb530a4d758194d6126af1e842d6cf865..43827d5085641017b1e769e863ef8336c7daa044 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -3,14 +3,15 @@
 
 # C++ compiler options
 CC = @CC@
-CPPFLAGS+= @CPPFLAGS@ @DEFS@
+CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@ @X_CFLAGS@
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
-LFLAGS+= @LDFLAGS@ 
-XLIBS:=@X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
+LFLAGS+= @LDFLAGS@
+LEFLAGS+= 
+XLIBS:=@X_LIBS@ @X_PRE_LIBS@ @X11LIB@ @X_EXTRA_LIBS@
 
 # Dep generation - this only works for gnu stuff
 INLINEDEPFLAG = -MD
@@ -19,7 +20,14 @@ INLINEDEPFLAG = -MD
 DEBIANDOC_HTML = @DEBIANDOC_HTML@
 DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
+# YODL for the man pages
+YODL_MAN = @YODL_MAN@
+
 # Various library checks
 X11LIB = @X11LIB@
 GPMLIB = @GPMLIB@
 SLANGLIB = @SLANGLIB@
+XPMLIB = @XPMLIB@
+PTHREADLIB = @PTHREADLIB@
+
+HAVE_C9X = @HAVE_C9X@