|
Check-in Number:
|
3941 | |
| Date: |
2003-Jan-23 18:48:44 (local)
2003-Jan-23 17:48:44 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
More configure fixes to help Linux systems with broken or missing X11 pieces. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/as_rand.cpp 1.1 -> 1.2
--- 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
|
|
ossp-pkg/as/as-gui/configure.in 1.19 -> 1.20
--- 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,
|
|
