X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=e614456efd23100439ace27201bd87ad8f69a640;hb=6bb727f03bff0389fbb1349d7df4c9d8d7532959;hp=76ce4d2edcc10ce498b13b64d7ced16e30bcbb7f;hpb=5b7bc6e70fb439cf4c4bf771ae9f94077fe4fe08;p=xscreensaver

diff --git a/configure.in b/configure.in
index 76ce4d2e..e614456e 100644
--- a/configure.in
+++ b/configure.in
@@ -60,9 +60,8 @@ AC_HEADER_DIRENT
 
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
-AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
-
+AC_TYPE_SIGNAL
 
 AC_MSG_CHECKING(how to call gettimeofday)
 AC_CACHE_VAL(ac_cv_gettimeofday_args,
@@ -91,6 +90,8 @@ fi
 
 
 AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv)
+AC_CHECK_FUNCS(sigaction)
+
 AC_CHECK_HEADERS(unistd.h)
 
 dnl	/usr/local/src/ssh-1.2.17/putenv.c -- AC_REPLACE_FUNCS(putenv)
@@ -331,15 +332,22 @@ case "$host" in
     if test -d /usr/contrib/X11R6/include ; then
       X_CFLAGS="-I/usr/contrib/X11R6/include $X_CFLAGS"
       X_LIBS="-L/usr/contrib/X11R6/lib $X_LIBS"
+    elif test -d /usr/X11R6/include ; then
+      X_CFLAGS="-I/usr/X11R6/include $X_CFLAGS"
+      X_LIBS="-L/usr/X11R6/lib $X_LIBS"
     elif test -d /usr/contrib/X11R5/include ; then
       X_CFLAGS="-I/usr/contrib/X11R5/include $X_CFLAGS"
       X_LIBS="-L/usr/contrib/X11R5/lib $X_LIBS"
+    elif test -d /usr/X11R5/include ; then
+      X_CFLAGS="-I/usr/X11R5/include $X_CFLAGS"
+      X_LIBS="-L/usr/X11R5/lib $X_LIBS"
     fi
 
   ;;
   *-solaris*)
     # Same to you, pinheads.  (Is this really the standard location now?
     # What happened to the joke that this kind of thing went in /opt?)
+    # cthomp says "answer: CDE (Common Disorganized Environment)"
     if test -f /usr/dt/include/Xm/Xm.h ; then
       X_CFLAGS="$X_CFLAGS -I/usr/dt/include"
       X_LIBS="$X_LIBS -L/usr/dt/lib -R:/usr/dt/lib"
@@ -816,7 +824,7 @@ if test $with_sgivideo = yes; then
     have_sgivideo=no
     AC_CHECK_LIB(vl, vlOpenVideo, have_sgivideo=yes)
     if test $have_sgivideo = yes; then
-      SGI_VIDEO_OBJS="$(UTILS_SRC)/sgivideo.o"
+      SGI_VIDEO_OBJS="$(UTILS_BIN)/sgivideo.o"
       SGI_VIDEO_LIBS="-lvl"
       AC_DEFINE(HAVE_SGI_VIDEO)
     fi