--- rpl/Attic/configure.in	2010/08/06 15:32:16	1.33
+++ rpl/Attic/configure.in	2010/08/13 21:02:19	1.36
@@ -260,6 +260,12 @@ fi
 if test ! -d "$srcdir"/tools/$GSL; then
 	gunzip -c "$srcdir"/tools/$GSL.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf -)
+	if test $(uname) = "OS/2"; then
+		(cd "$srcdir"/tools/$GSL; \
+				TMP=$(mktemp tmp.XXXXXXXXXX); \
+				sed -e '1,$s/\${1+"\$@"}/"\$@"/g' ltmain.sh > $TMP; \
+				\mv -f $TMP ltmain.sh)
+	fi
 fi
 if test ! -d "$srcdir"/tools/$GPP; then
 	gunzip -c "$srcdir"/tools/$GPP.tar.gz | \
@@ -460,6 +466,16 @@ dnl Checks for libraries
 AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can not find libm !]))
 AC_CHECK_LIB(pthread, main,, AC_MSG_ERROR([Can not find libpthread !]))
 
+dnl Check for union semun
+AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[
+#include <sys/sem.h>
+]])
+
+dnl Check for IPv6 support
+AC_CHECK_TYPE([struct sockaddr_in6], IPV6=-DIPV6, IPV6=-UIPV6, [[
+#include <netinet/in.h>
+]])
+
 dnl Do we need to use -ldl?
 if test "$CYGWIN" != yes; then
 	AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl",
@@ -775,22 +791,13 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \
 		strerror strspn strstr strtod)
 
-AC_CONFIG_SUBDIRS(tools/$NCURSES)
-AC_CONFIG_SUBDIRS(tools/$READLINE)
-AC_CONFIG_SUBDIRS(tools/$GSL)
-AC_CONFIG_SUBDIRS(tools/$GPP)
-AC_CONFIG_SUBDIRS(tools/$FILE)
-AC_CONFIG_SUBDIRS(tools/$ICONV)
-AC_CONFIG_SUBDIRS(tools/$SQLITE)
-AC_CONFIG_SUBDIRS(tools/$UNITS)
-
 dnl Check for OpenSSL os/comp
 AC_ARG_WITH(openssl_arch,
 [  --with-openssl-arch=ARCH  specify os and compiler for openssl (ARCH or list)],
 [], [with_openssl_arch=none])
 
 if test $(uname) = "OS/2"; then
-	(cd tools/$OPENSSL && os2/OS2-EMX.cmd)
+	bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"
 else
 	if test "x$with_openssl_arch" = xnone; then
 		(cd tools/$OPENSSL && ./config)
@@ -805,6 +812,15 @@ else
 	fi
 fi
 
+AC_CONFIG_SUBDIRS(tools/$NCURSES)
+AC_CONFIG_SUBDIRS(tools/$READLINE)
+AC_CONFIG_SUBDIRS(tools/$GSL)
+AC_CONFIG_SUBDIRS(tools/$GPP)
+AC_CONFIG_SUBDIRS(tools/$FILE)
+AC_CONFIG_SUBDIRS(tools/$ICONV)
+AC_CONFIG_SUBDIRS(tools/$SQLITE)
+AC_CONFIG_SUBDIRS(tools/$UNITS)
+
 if test "$MYGNUPLOT" = "yes"; then
 	if test ! -d "$srcdir"/tools/$GNUPLOT; then
 		gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \
@@ -877,51 +893,75 @@ case $OS in
 		EXPORT_DYNAMIC=-Wl,-flat_namespace
 		NESTED_FUNCTIONS=-fnested-functions
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
 		CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING"
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
+		C_STANDARD=-std=gnu99
 	break ;;
 
     Cygwin)
 		EXPORT_DYNAMIC=-Wl,--export-all-symbols
 		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 ;;
 
+	Interix)
+		EXPORT_DYNAMIC=-Wl,--export-all-symbols
+		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;;
+
     AIX)
 		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
+		C_STANDARD=-std=gnu99
 	break ;;
 
     OS/2)
 		MALLOC=
 		OS=OS2
-		FINAL_ENCODING=UTF-8
+		FINAL_ENCODING=CP850
 		NESTED_FUNCTIONS=
 		EXPORT_DYNAMIC=-Zmap
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+		SEMAPHORES_SYSV=-DSEMAPHORES_SYSV
 		ac_configure_args="$ac_configure_args --without-readline \
 				--without-cairo --disable-shared --enable-static"
+		C_STANDARD=
 	break;;
 
     *)
 		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 ;;
 
 esac
 
+AC_SUBST(C_STANDARD)
 AC_SUBST(EXPORT_DYNAMIC)
 AC_SUBST(NESTED_FUNCTIONS)
 AC_SUBST(SEMAPHORES_NOMMES)
+AC_SUBST(SEMAPHORES_SYSV)
+AC_SUBST(SEMUN)
+AC_SUBST(IPV6)
 
 AC_SUBST(NCURSES)
 AC_SUBST(READLINE)