set up automake

diff --git a/TSRM/Makefile b/TSRM/Makefile
deleted file mode 100644 (file)
index 9a91e1a..0000000
--- a/TSRM/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -DPTHREADS -DHAVE_STDARG_H=1
-OBJS = TSRM.o
-AR = ar
-
-libtsrm.a:     $(OBJS)
-       $(AR) cru libtsrm.a $(OBJS)

diff --git a/TSRM/Makefile.am b/TSRM/Makefile.am
new file mode 100644 (file)
index 0000000..6bea4e8
--- /dev/null
+++ b/TSRM/Makefile.am
@@ -0,0 +1,4 @@
+## process this file with automake to produce Makefile.am
+AUTOMAKE_OPTIONS=foreign
+lib_LIBRARIES=libtsrm.a
+libtsrm_a_SOURCES = TSRM.c

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index a3ba6c25c183876d86d101f19561add8c2f5aa29..a240e2ee7099239f93b1004647473e94966b578e 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -17,8 +17,8 @@
 #ifndef _TSRM_H
 #define _TSRM_H
 
-#if !(WIN32||WINNT)
-# define PTHREADS
+#ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #if WIN32||WINNT

diff --git a/TSRM/acconfig.h b/TSRM/acconfig.h
new file mode 100644 (file)
index 0000000..1066662
--- /dev/null
+++ b/TSRM/acconfig.h
@@ -0,0 +1,7 @@
+#undef PTHREADS
+
+#ifdef DEFINE_TSRM_VERSION
+# undef PACKAGE
+# undef VERSION
+#endif
+

diff --git a/TSRM/buildconf b/TSRM/buildconf
new file mode 100755 (executable)
index 0000000..3a896bc
--- /dev/null
+++ b/TSRM/buildconf
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+mv aclocal.m4 aclocal.m4.old 2>/dev/null
+aclocal
+if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
+    echo keeping ${1}aclocal.m4
+    mv aclocal.m4.old aclocal.m4
+else
+    echo created or modified ${1}aclocal.m4
+fi
+
+autoheader
+
+automake --add-missing --include-deps
+
+mv configure configure.old 2>/dev/null
+autoconf
+if cmp configure.old configure > /dev/null 2>&1; then
+    echo keeping ${1}configure
+    mv configure.old configure
+else
+    echo created or modified ${1}configure
+fi
+

diff --git a/TSRM/configure.in b/TSRM/configure.in
new file mode 100644 (file)
index 0000000..e6f8114
--- /dev/null
+++ b/TSRM/configure.in
@@ -0,0 +1,21 @@
+dnl $Id$
+dnl
+dnl Minimalistic configure.in for TSRM.
+dnl
+
+AC_INIT(TSRM.c)
+AM_INIT_AUTOMAKE(TSRM, 1.0)
+AM_CONFIG_HEADER(tsrm_config.h)
+
+AC_PROG_CC
+AC_PROG_CC_C_O
+AC_PROG_RANLIB
+
+AC_CHECK_LIB(pthread, pthread_create, [
+  AC_DEFINE(PTHREADS)
+  LIBS="$LIBS -lpthread"
+],[
+  AC_MSG_ERROR(You need pthreads to build TSRM.)
+])
+
+AC_OUTPUT(Makefile)