--- rpl/Attic/configure.in	2010/08/13 21:02:19	1.36
+++ rpl/Attic/configure.in	2010/08/15 14:46:23	1.37
@@ -140,11 +140,14 @@ AC_ARG_ENABLE(final-encoding,
 if test "$enableval" = "no"; then
 	FINAL_ENCODING="\$(shell locale charmap | \
 		\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"
+	FORCED_FINAL_ENCODING=0
 else
 	FINAL_ENCODING="$enable_final_encoding"
-fi],
+	FORCED_FINAL_ENCODING=1
+fi], [
+FORCED_FINAL_ENCODING=0
 FINAL_ENCODING="\$(shell locale charmap | \
-	\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')")
+	\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"])
 
 AC_ARG_ENABLE(tex,
 [  --enable-tex            provide the TeX support [[default=guessed]]], [
@@ -473,6 +476,7 @@ AC_CHECK_TYPE([union semun], SEMUN=-DUNI
 
 dnl Check for IPv6 support
 AC_CHECK_TYPE([struct sockaddr_in6], IPV6=-DIPV6, IPV6=-UIPV6, [[
+#include <sys/types.h>
 #include <netinet/in.h>
 ]])
 
@@ -785,6 +789,22 @@ AC_CACHE_CHECK([return type of signal ha
 AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
 		    (`int' or `void').])
 
+dnl Checks for broken siginfo structure
+AC_MSG_CHECKING([for broken siginfo->si_pid])
+AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
+#include <signal.h>
+int flag;
+void handler(int signal, siginfo_t *siginfo, void *context)
+{ flag = ((*siginfo).si_pid == getpid()) ? 0 : -1; }],
+[struct sigaction    action;
+action.sa_sigaction = handler;
+action.sa_flags = SA_SIGINFO;
+sigaction(SIGUSR1, &action, NULL);
+raise(SIGUSR1);
+return(flag);])],
+[BROKEN_SIGINFO=-U_BROKEN_SIGINFO; AC_MSG_RESULT(no)],
+[BROKEN_SIGINFO=-D_BROKEN_SIGINFO; AC_MSG_RESULT(yes)])
+
 AC_FUNC_STRCOLL
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
@@ -932,8 +952,10 @@ case $OS in
 
     OS/2)
 		MALLOC=
+		if test FORCED_FINAL_ENCODING -eq 0; then \
+			FINAL_ENCODING=CP850; \
+		fi;
 		OS=OS2
-		FINAL_ENCODING=CP850
 		NESTED_FUNCTIONS=
 		EXPORT_DYNAMIC=-Zmap
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
@@ -943,6 +965,19 @@ case $OS in
 		C_STANDARD=
 	break;;
 
+	OpenBSD)
+		if test FORCED_FINAL_ENCODING -eq 0; then \
+			FINAL_ENCODING=UTF-8; \
+		fi;
+		EXPORT_DYNAMIC=-Wl,--export-dynamic
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+		ac_configure_args="$ac_configure_args --with-readline=builtin \
+				--disable-shared --enable-static"
+		C_STANDARD=-std=gnu99
+	break;;
+
     *)
 		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
@@ -962,6 +997,7 @@ AC_SUBST(SEMAPHORES_NOMMES)
 AC_SUBST(SEMAPHORES_SYSV)
 AC_SUBST(SEMUN)
 AC_SUBST(IPV6)
+AC_SUBST(BROKEN_SIGINFO)
 
 AC_SUBST(NCURSES)
 AC_SUBST(READLINE)