summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-05-03 23:45:16 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-05-03 23:45:16 +0000
commitb46d6a44fa97a3e66de828385026b7f84d9e59b8 (patch)
tree5ea4b3238c140c0ab4a5607d30a593e5ec801b5a /configure.ac
parentfc91ca069dd55490b99b096f029e0864b049120c (diff)
Make Xephyr build on Solaris:
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since they're not needed for Xephyr-only builds Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index e43354cd7..cb13e40f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1463,6 +1463,10 @@ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
#AM_CONDITIONAL(KDRIVEVESA, false)
#AM_CONDITIONAL(KDRIVEFBDEV, false)
+# Xephyr needs nanosleep() which is in librt on Solaris
+AC_CHECK_FUNC([nanosleep], [],
+ AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
+
AM_CONDITIONAL(XEPHYR, [test x"$xephyr" = xyes])
XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
AC_SUBST([XEPHYR_LIBS])