Index: ossp-pkg/as/as-gui/as_rand.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_rand.cpp,v
rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_rand.cpp,v' 2>/dev/null
--- as_rand.cpp	2003/01/22 18:57:57	1.1
+++ as_rand.cpp	2003/01/23 17:48:44	1.2
@@ -34,15 +34,22 @@
 
 #include "as_rand.h"
 
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif // HAVE_UNISTD_H
-#ifdef HAVE_STDLIB_H
+#if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif // HAVE_STDLIB_H
 
-#ifdef TIME_WITH_SYS_TIME
+#if TIME_WITH_SYS_TIME
 #include <sys/time.h>
+#include <time.h>
+#else
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif // HAVE_SYS_TIME_H
 #endif // TIME_WITH_SYS_TIME
 
 
Index: ossp-pkg/as/as-gui/configure.in
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/configure.in,v
rcsdiff -q -kk '-r1.19' '-r1.20' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/configure.in,v' 2>/dev/null
--- configure.in	2003/01/22 22:14:52	1.19
+++ configure.in	2003/01/23 17:48:44	1.20
@@ -99,10 +99,14 @@
 if test ".$no_x" = .yes; then
     AC_ERROR([X11 includes and libraries are required, but none were found.])
 else
+if test $x_includes; then
     CXXFLAGS="$CXXFLAGS -I$x_includes"
+fi
+if test $x_libraries; then
     LDFLAGS="$LDFLAGS -L$x_libraries"
     LIBS="$LIBS -lX11 -lXext -lSM -lm"
 fi
+fi
 
 dnl Check data type sizes of particular architecture
 dnl Hack: We're really interested in the unsigned types,