From 8dfe66d56596a3eb9e5269e12929d594e8039f00 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 11 Jan 2005 20:50:28 +0000
Subject: [PATCH 1/1] Added check for various POSIX headers. Abort configure
 if YAZ++ is not found.

---
 configure.in           |    5 ++++-
 src/yaz-proxy-main.cpp |   21 ++++++++++++---------
 src/yaz-proxy.cpp      |   17 ++++++++++-------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/configure.in b/configure.in
index 8a9a848..c7bf985 100644
--- a/configure.in
+++ b/configure.in
@@ -9,10 +9,14 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
 YAZPP_INIT(threads,1.0)
+if test -z "$YAZPPLIB"; then
+	AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
 YAZ_DOC
 USEMARCON_INIT
 
 AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday)
+AC_CHECK_HEADERS(sys/time.h unistd.h sys/types.h sys/stat.h sys/resource.h)
 dnl
 dnl ----- libXSLT
 AC_SUBST(XSLT_LIBS)
@@ -43,7 +47,6 @@ AC_SUBST(YAZPROXY_SRC_ROOT)
 AC_SUBST(YAZPROXY_BUILD_ROOT)
 YAZPROXY_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZPROXY_BUILD_ROOT=`pwd`
-
 AC_OUTPUT([
 	Makefile
 	src/Makefile
diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index e64b4c9..70d8eeb 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,5 +1,5 @@
-/* $Id: yaz-proxy-main.cpp,v 1.7 2004-12-13 20:52:33 adam Exp $
-   Copyright (c) 1998-2004, Index Data.
+/* $Id: yaz-proxy-main.cpp,v 1.8 2005-01-11 20:50:28 adam Exp $
+   Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
 
@@ -19,21 +19,24 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
 
-#ifdef WIN32
-#else
 #include <signal.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <pwd.h>
 #endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
-
-#include <stdarg.h>
-
-#if HAVE_GETRLIMIT
+#endif
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
+#include <pwd.h>
+
+#include <stdarg.h>
+
 #include <yaz/log.h>
 #include <yaz/options.h>
 
diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 5d7bded..dd2bcaa 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,5 +1,5 @@
-/* $Id: yaz-proxy.cpp,v 1.15 2004-12-15 11:42:27 adam Exp $
-   Copyright (c) 1998-2004, Index Data.
+/* $Id: yaz-proxy.cpp,v 1.16 2005-01-11 20:50:29 adam Exp $
+   Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
 
@@ -19,18 +19,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
 
-#ifdef WIN32
-#else
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-
-#if HAVE_GETTIMEOFDAY
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #include <assert.h>
 #include <time.h>
-#include <sys/types.h>
 #include <fcntl.h>
 
 #include <yaz/srw.h>
-- 
1.7.10.4