Add test for union semun to configure

Remove references to NEED_UNION_SEMUN from include/config.h.in and
from include/storage/ipc.h, replacing it with a single HAVE_UNION_SEMUN

src/configure.in

@@ -133,8 +133,18 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Check for any "odd" conditions
+AC_MSG_CHECKING(for int timezone)
 AC_TRY_LINK([#include <time.h>], 
-            [int res = timezone / 60; ], AC_DEFINE(HAVE_INT_TIMEZONE))
+            [int res = timezone / 60; ], 
+            [AC_DEFINE(HAVE_INT_TIMEZONE), AC_MSG_RESULT(yes)],
+            AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(for union semun)
+AC_TRY_LINK([#include <sys/types.h>
+#include <sys/sem.h>],
+            [union semun semun;],
+            [AC_DEFINE(HAVE_UNION_SEMUN) AC_MSG_RESULT(yes)],
+            AC_MSG_RESULT(no))
 
 dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL

src/include/config.h.in

@@ -71,6 +71,9 @@
 /* Set to 1 if you have libhistory.a */
 #undef HAVE_LIBHISTORY
 
+/* Set to 1 if you have union semun */
+#undef HAVE_UNION_SEMUN
+
 /*
  * Code below this point should not require changes
  */
@@ -78,7 +81,6 @@
 #if defined(aix)
 #  define CLASS_CONFLICT 
 #  define DISABLE_XOPEN_NLS 
-#  define NEED_UNION_SEMUN 
 #  define HAVE_SYS_SELECT_H
 #  define HAVE_ANSI_CPP
 #  define HAS_TEST_AND_SET
@@ -90,7 +92,6 @@
 #  define USE_POSIX_SIGNALS
 #  define DISABLE_XOPEN_NLS 
 #  define HAS_LONG_LONG
-#  define NEED_UNION_SEMUN 
 #  define HAS_TEST_AND_SET
 #  include <sys/mman.h>  /* for msemaphore */
    typedef msemaphore slock_t;
@@ -113,9 +114,6 @@
 #  if defined(sparc)
 #    define NEED_SPARC_TAS_ASM
 #  endif
-#  if defined(PRE_BSDI_2_1)
-#    define NEED_UNION_SEMUN 
-#  endif
 #  define USE_POSIX_TIME
 #  define HAS_TEST_AND_SET
    typedef unsigned char slock_t;
@@ -124,14 +122,12 @@
 
 #if defined(dgux)
 #  define LINUX_ELF
-#  define NEED_UNION_SEMUN 
 #  define USE_POSIX_SIGNALS
 #endif
 
 #if defined(hpux)
 #  define JMP_BUF
 #  define USE_POSIX_TIME
-#  define NEED_UNION_SEMUN 
 #  define HAS_TEST_AND_SET
    typedef struct { int sem[4]; } slock_t;
 #endif
@@ -141,7 +137,6 @@
 #  define USE_POSIX_SIGNALS
 #  define NEED_RUSAGE 
 #  define NO_EMPTY_STMTS
-#  define NEED_UNION_SEMUN 
 #  define SYSV_DIRENT
 #  define HAS_TEST_AND_SET
    typedef unsigned char slock_t;
@@ -195,17 +190,12 @@
   typedef struct mutex slock_t;
 #endif
 
-#if defined(sequent) 
-#  define NEED_UNION_SEMUN 
-#endif
-
 #if defined(sparc_solaris)
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  define NEED_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define USE_POSIX_TIME
-#  define NEED_UNION_SEMUN 
 #  define SYSV_DIRENT
 #  define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
@@ -221,7 +211,6 @@ typedef unsigned char slock_t;
 #  define USE_POSIX_SIGNALS
 #  define NEED_RUSAGE 
 #  define NO_EMPTY_STMTS
-#  define NEED_UNION_SEMUN 
 #  define SYSV_DIRENT
 #endif
 
@@ -231,7 +220,6 @@ typedef unsigned char slock_t;
 #  define NO_UNISTD_H
 #  define USES_WINSOCK 
 #  define NOFILE	100
-#  define NEED_UNION_SEMUN
 #  ifndef MAXPATHLEN
 #  define MAXPATHLEN    250
 #  endif
@@ -239,7 +227,6 @@ typedef unsigned char slock_t;
 
 #if defined(ultrix4)
 #  define USE_POSIX_TIME
-#  define NEED_UNION_SEMUN 
 #  define NEED_STRDUP
 #endif
 

src/include/storage/ipc.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.13 1997/01/26 20:15:26 momjian Exp $
+ * $Id: ipc.h,v 1.14 1997/02/06 05:30:50 scrappy Exp $
  *
  * NOTES
  *    This file is very architecture-specific.  This stuff should actually
@@ -43,7 +43,7 @@ extern int S_LOCK_FREE(slock_t *lock);
 
 #endif /* HAS_TEST_AND_SET */
 
-#ifdef NEED_UNION_SEMUN
+#ifndef HAVE_UNION_SEMUN
 union semun {
     int val;
     struct semid_ds *buf;