* GCC 2.95 compatibility.

configure.ac

@@ -26,6 +26,22 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 
+# Check for pubsetbuf.
+AC_MSG_CHECKING([for pubsetbuf])
+AC_LANG_PUSH(C++)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iostream>
+using namespace std;
+static char buf[1024];]],
+    [[cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));]])],
+    [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_PUBSETBUF, 1, [whether pubsetbuf is available])],
+    AC_MSG_RESULT(no))
+AC_LANG_POP(C++)
+
+# Check for <locale>
+AC_LANG_PUSH(C++)
+AC_CHECK_HEADERS([locale])
+AC_LANG_POP(C++)
+
 AC_PATH_PROG(wget, wget)
 AC_PATH_PROG(xmllint, xmllint)
 AC_PATH_PROG(xsltproc, xsltproc)

src/boost/format.hpp

@@ -24,10 +24,13 @@
 #include <sstream>
 #include <cassert>
 
+#if HAVE_LOCALE
 #include <locale>
-//#define BOOST_NO_STD_LOCALE
+#else
-//#define BOOST_NO_LOCALE_ISIDIGIT
+#define BOOST_NO_STD_LOCALE
-//#include <cctype>
+#define BOOST_NO_LOCALE_ISIDIGIT
+#include <cctype>
+#endif
 
 #include <boost/format/macros_default.hpp>
 

src/libmain/shared.cc

@@ -1,3 +1,4 @@
+
 #include <iostream>
 #include <cctype>
 
@@ -71,7 +72,9 @@ int main(int argc, char * * argv)
     ATinit(argc, argv, &bottomOfStack);
 
     /* Turn on buffering for cerr. */
+#if HAVE_PUBSETBUF
     cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));
+#endif
 
     try {
         initAndRun(argc, argv);

src/libstore/exec.cc

@@ -1,4 +1,5 @@
 #include <iostream>
+#include <cstdio>
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/libstore/store.cc

@@ -1,4 +1,5 @@
 #include <iostream>
+#include <algorithm>
 
 #include <sys/wait.h>
 #include <unistd.h>

src/nix-env/main.cc

@@ -1,3 +1,5 @@
+#include <cerrno>
+
 #include "globals.hh"
 #include "normalise.hh"
 #include "shared.hh"