Fixed autotools support.

SConstruct

@@ -1319,14 +1319,14 @@ AC_PROG_MAKE_SET
 AC_PROG_LN_S
 AC_PROG_LIBTOOL
 
+OST_LIB_PTHREAD  # from GNU Commons C++
+
 AM_SANITY_CHECK
 AM_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
 AM_ICONV
 
-OST_LIB_PTHREAD  # from GNU Commons C++
-
 
 #
 # Some checks

bootstrap

@@ -3,7 +3,8 @@
 # Bootstrap file for 'autotools' build
 #
 
-export WANT_AUTOCONF_2_5=1
+export WANT_AUTOCONF="latest"
+export WANT_AUTOMAKE="1.9"
 export LANG=C
 
 rm -f aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh INSTALL
@@ -39,6 +40,9 @@ if test $DIE = 0 ; then
 		|| (echo "[NO]" ; cat bootstrap.tmpout ; rm -f bootstrap.tmpout ; not_a_command >& /dev/null) || DIE=1
 fi
 
+# Bug with automake 1.10?
+touch autotools/config.rpath
+
 if test $DIE = 0 ; then
 	echo -n "* Running automake...   " ; (automake --add-missing --copy >& bootstrap.tmpout) \
 		&& (echo "[OK]" ; cat bootstrap.tmpout ; rm -f bootstrap.tmpout) \

m4/ost_posix.m4

@@ -0,0 +1,87 @@
+dnl Copyright (C) 1999-2001 Open Source Telecom Corporation.
+dnl  
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software 
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl 
+dnl As a special exception to the GNU General Public License, if you 
+dnl distribute this file as part of a program that contains a configuration 
+dnl script generated by Autoconf, you may include it under the same 
+dnl distribution terms that you use for the rest of that program.
+
+AC_DEFUN(OST_SYS_POSIX,[
+ AC_REQUIRE([OST_PROG_CC_POSIX])
+ AC_CACHE_CHECK(whether system meets Posix.1,
+	ost_cv_sys_posix1,
+	AC_TRY_COMPILE([
+		#include <sys/types.h>
+		#include <unistd.h>
+		],[
+		#ifndef	_POSIX_VERSION
+		fatal
+		#endif
+		],		
+             ost_cv_sys_posix1=yes,
+	     ost_cv_sys_posix1=no
+        )
+  )
+  if test $ost_cv_sys_posix1 = no ; then
+	AC_CHECK_HEADERS(unistd.h)
+  else
+	AC_DEFINE(HAVE_UNISTD_H, [1], [have unix header])
+  fi
+  AC_CHECK_HEADERS(features.h)
+  AH_TOP([
+/* hack for BROKEN autoheader, since it will not predicitably order
+   macros by any obvious means. */
+
+#undef HAVE_UNISTD_H
+#undef HAVE_FEATURES_H
+#undef HAVE_SYS_TYPES_H
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifndef	WIN32
+#ifdef	HAVE_FEATURES_H
+#include <features.h>
+#endif
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+	])
+])
+
+AC_DEFUN(OST_CC_FCNTL,[
+	AC_REQUIRE([OST_SYS_POSIX])
+	AC_CHECK_HEADERS(fcntl.h sys/fcntl.h)
+AH_BOTTOM([
+
+#ifndef HAVE_FCNTL_H
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif
+#else
+#include <fcntl.h>
+#ifndef O_NDELAY
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif
+#endif
+#endif
+	])
+])
+

m4/ost_prog.m4

@@ -0,0 +1,61 @@
+dnl Copyright (C) 1999-2001 Open Source Telecom Corporation.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a configuration
+dnl script generated by Autoconf, you may include it under the same
+dnl distribution terms that you use for the rest of that program.
+
+AC_DEFUN(OST_PROG_CC_POSIX,[
+	AC_PROG_CC
+	AC_PROG_CPP
+	AC_ISC_POSIX]
+)
+
+AC_DEFUN(OST_PROG_COMMON,[
+	AC_REQUIRE([AC_PROG_INSTALL])
+	AC_REQUIRE([AC_PROG_MAKE_SET])
+])
+
+AC_DEFUN(OST_PROJ_LIBRARY,[
+	AC_REQUIRE([AM_PROG_LIBTOOL])
+	AC_REQUIRE([AC_PROG_RANLIB])
+	if test ! -z "[$2]" ; then
+		if test ! -z "[$3]" ; then
+			LT_[$1]_VERSION="-version-info [$3] -release [$2]"
+		else
+			LT_[$1]_VERSION="-release [$2]"
+		fi
+		AC_SUBST(LT_[$1]_VERSION)
+	fi
+])
+
+AC_DEFUN(OST_PROG_LIBVER,[
+	LT_MAJOR="`echo $LT_VERSION | sed s/:.*$//`"
+	AC_SUBST(LT_RELEASE)
+	AC_SUBST(LT_MAJOR)
+])
+
+
+AC_DEFUN(OST_PROG_LIBRARY,[
+	AC_REQUIRE([AM_PROG_LIBTOOL])
+	AC_REQUIRE([AC_PROG_RANLIB])
+	if test ! -z "[$2]" ; then
+		LT_[$1]_VERSION="-version-info [$2]"
+		AC_SUBST(LT_[$1]_VERSION)
+	fi
+])
+

m4/ost_systime.m4

@@ -0,0 +1,40 @@
+dnl Copyright (C) 1999-2001 Open Source Telecom Corporation.
+dnl  
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software 
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl 
+dnl As a special exception to the GNU General Public License, if you 
+dnl distribute this file as part of a program that contains a configuration 
+dnl script generated by Autoconf, you may include it under the same 
+dnl distribution terms that you use for the rest of that program.
+
+AC_DEFUN(OST_CC_SYSTIME,[
+	AC_HEADER_TIME
+	AC_CHECK_HEADERS(sys/time.h)
+AH_TOP([
+#undef HAVE_SYS_TIME_H
+#if TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+	])
+
+])
+