* apt-pkg/deb/dpkgpm.cc:

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

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index e7545bac87dbfbc3c1bad121e9cb3883e30f920a..4e47692f50f3e5aabee681c026078d24298e3e00 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -1,48 +1,74 @@
 # This file contains everything that autoconf guessed for your system.
 # if you want you can edit it, just don't re-run configure.
 
 # 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@
 # C++ compiler options
 CC = @CC@

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

 CXX = @CXX@
 CXX = @CXX@

-CXXFLAGS+= @CXXFLAGS@ @X_CFLAGS@
+CXXFLAGS+= @CXXFLAGS@

 NUM_PROCS = @NUM_PROCS@
 NUM_PROCS = @NUM_PROCS@

+GLIBC_VER = @GLIBC_VER@
+LIBSTDCPP_VER = @LIBSTDCPP_VER@

 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
 LFLAGS+= @LDFLAGS@
 LEFLAGS+= 
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
 LFLAGS+= @LDFLAGS@
 LEFLAGS+= 

-XLIBS:= @X_LIBS@ @X_PRE_LIBS@ @X11LIB@ @X_EXTRA_LIBS@

 SOCKETLIBS:= @SOCKETLIBS@
 SOCKETLIBS:= @SOCKETLIBS@

+AR:=@AR@
+RANLIB:=@RANLIB@

 
 # Dep generation - this only works for gnu stuff
 
 # Dep generation - this only works for gnu stuff

+GCC3DEP = @GCC3DEP@

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

-# YODL for the man pages
-YODL_MAN = @YODL_MAN@
+DOXYGEN = @DOXYGEN@
+
+# SGML for the man pages
+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
+BASH = @BASH@

 
 # Various library checks
 
 # Various library checks

-X11LIB = @X11LIB@
-GPMLIB = @GPMLIB@
-SLANGLIB = @SLANGLIB@
-XPMLIB = @XPMLIB@

 PTHREADLIB = @PTHREADLIB@
 PTHREADLIB = @PTHREADLIB@

+PYTHONLIB = @PYTHONLIB@
+PYTHONVER = @PYTHONVER@
+PYTHONPREFIX = @PYTHONPREFIX@
+PYTHONEXECPREFIX = @PYTHONEXECPREFIX@
+PYTHONINCLUDE = @PYTHONINCLUDE@
+BDBLIB = @BDBLIB@
+INTLLIBS = @INTLLIBS@

 
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@
 HAVE_STATVFS = @HAVE_STATVFS@
 
 # 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@
 
 # Shared library things
 HOST_OS = @host_os@

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

    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=

-else   
-   # Do not know how to creat shared libraries here.
+else
+   # Do not know how to create shared libraries here.

    ONLYSTATICLIBS = yes
 endif
        
    ONLYSTATICLIBS = yes
 endif