3 files changed, 9 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 5ae7b27..b3141f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,16 +6,19 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 AC_PROG_INSTALL
 AC_PROG_AWK
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/types.h sys/stat.h])
+AC_CHECK_DECLS([environ],,,[
+ #include <unistd.h>
+])
 
 HAVE_FCGI=false
 AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS([fcgio.h],[
  AC_CHECK_LIB(fcgi,FCGX_Init,[
   LIBS="-lfcgi ${LIBS}"
   AC_CHECK_LIB([fcgi++],[main],[
    LIBS="-lfcgi++ ${LIBS}"
diff --git a/src/Makefile.am b/src/Makefile.am
index e5c6778..d516d37 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 lib_LTLIBRARIES = libkingate.la libkingate-plaincgi.la
 
 if HAVE_FCGI
 lib_LTLIBRARIES += libkingate-fcgi.la
 endif
 
-INCLUDES = -I${top_srcdir}/include
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}
 AM_CXXFLAGS = ${KONFORKA_CFLAGS}
 LDADD = ${KONFORKA_LIBS}
 
 libkingate_la_SOURCES = \
     cgi_gateway.cc \
     cgi_interface.cc \
     util.cc
 libkingate_la_LDFLAGS = -version-info 1:0:0
diff --git a/src/plaincgi.cc b/src/plaincgi.cc
index 6934748..1cb7dc6 100644
--- a/src/plaincgi.cc
+++ b/src/plaincgi.cc
@@ -1,13 +1,18 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "kingate/plaincgi.h"
 #include "kingate/exception.h"
+#include "config.h"
+
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif /* HAVE_DECL_ENVIRON */
 
 namespace kingate {
 
         plaincgi_interface::plaincgi_interface() {
             for(char **p = environ; *p; p++) {
                 const char *e = strchr(*p,'=');
                 if(!e){
                     // XXX: check if we have it already?