summaryrefslogtreecommitdiff
path: root/TSRM
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-17 13:36:15 +0000
committerSascha Schumann <sas@php.net>1999-12-17 13:36:15 +0000
commit91549cfa4fe0e8aac9e56d0a603de6d9d22c8396 (patch)
treebdfc775b76697f94c9bcc7f68b71c13846e742ca /TSRM
parent7fe808ea028595d6bc1a72d016d5420845a57ae2 (diff)
downloadphp-git-91549cfa4fe0e8aac9e56d0a603de6d9d22c8396.tar.gz
Move config code into separate file
Diffstat (limited to 'TSRM')
-rw-r--r--TSRM/configure.in22
-rw-r--r--TSRM/tsrm.m425
2 files changed, 30 insertions, 17 deletions
diff --git a/TSRM/configure.in b/TSRM/configure.in
index ded8166948..43171d8f5d 100644
--- a/TSRM/configure.in
+++ b/TSRM/configure.in
@@ -7,27 +7,15 @@ AC_INIT(TSRM.c)
AM_INIT_AUTOMAKE(TSRM, 1.0)
AM_CONFIG_HEADER(tsrm_config.h)
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_PROG_CC_C_O
-AC_PROG_RANLIB
-
+sinclude(tsrm.m4)
+
+TSRM_BASIC_CHECKS
+
AM_PROG_LIBTOOL
if test "$enable_debug" != "yes"; then
AM_SET_LIBTOOL_VARIABLE([--silent])
fi
-AC_CHECK_LIB(c_r, pthread_kill)
-AC_CHECK_LIB(pthread, pthread_kill)
-
-AC_CHECK_FUNCS(pthread_kill)
-
-if test "$ac_cv_func_pthread_kill" != "yes"; then
- AC_MSG_ERROR(You need pthreads to build TSRM.)
-fi
-
-AC_DEFINE(PTHREADS)
-
-AC_CHECK_HEADERS(stdarg.h)
+TSRM_PTHREAD
AC_OUTPUT(Makefile)
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4
new file mode 100644
index 0000000000..352b4654e1
--- /dev/null
+++ b/TSRM/tsrm.m4
@@ -0,0 +1,25 @@
+
+AC_DEFUN(TSRM_BASIC_CHECKS,[
+
+AC_REQUIRE([AC_PROG_CC])dnl
+dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
+AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+
+AC_CHECK_HEADERS(stdarg.h)
+
+])
+
+AC_DEFUN(TSRM_PTHREAD,[
+
+AC_CHECK_LIB(c_r, pthread_kill)
+AC_CHECK_LIB(pthread, pthread_kill)
+
+AC_CHECK_FUNCS(pthread_kill)
+
+if test "$ac_cv_func_pthread_kill" != "yes"; then
+ AC_MSG_ERROR(You need pthreads to build TSRM.)
+fi
+
+AC_DEFINE(PTHREADS, [], Whether to use Pthreads)
+])